Fixes to prior commit
commit0c1f68793895153aef6c96b7fa9d75cb97f7fcf1
authorbradymiller <bradymiller@users.sourceforge.net>
Fri, 18 Sep 2015 05:49:47 +0000 (17 22:49 -0700)
committerbradymiller <bradymiller@users.sourceforge.net>
Sun, 20 Sep 2015 07:31:00 +0000 (20 00:31 -0700)
tree5a1a97e0d9157bca32c9e726a290a8c1a66ee986
parent81d00d00b96e00146a0ddbb40ad85fd308ea38d8
Fixes to prior commit

-- Removed the interface/main/calendar/modules/PostCalendar/pntemplates/compiled/ files
-- Reverted removal of several database items related to recent commits

sql/4_2_0-to-4_2_1_upgrade.sql:
--I removed the odd list_id outcome title Resolved codes that added a SNOMED code to it. Since this was not included in database.sql and no other items on the outcome list were processed, I removed this. (if this is needed, then can add it back in a future commit)
--Portal_Relationship list is only here and not in database.sql and not used anywhere in the code, so I removed it. (if this is needed, then can add it back in a future commit)
--I set new abook_type list_options entries option_value settings like in database.sql file.
--The declne_to_specfy in race already existed, so I removed this entry.
--I removed the race items that already exists and I set the notes items for the race items that already exist.
--I added ethnicity list_options notes entries(I got them from entries in database.sql)
--I added the 2 new code types here (LOINC and PHIM Questions)
--I removed Unassigned from the Occupation list(gui was showing two Unassigned choices).
--I hid the 2 new code types from showing up in fee sheet.
--I fixed layout_options Occupation item.

sql/database.sql:
--I incremented categories_seq by 1.
--I removed order_title, code_suffix, and profile_title from the procedure_results table; was not in upgrade script and unclear if used in code. (if this is needed, then can add it back in a future commit)
--I removed the redundant race list_options items.
--I removed Unassigned from the Occupation list(gui was showing two Unassigned choices).
--I hid the 2 new code types from showing up in fee sheet.
--I fixed layout_options Occupation item.
--I added missing care_team entry to layout_options.

GENERAL DATABASE ITEMS:
--I fixed the database incrementing values in pertinent tables
--I fixed registry table to have correct incrementing id value and supported this in the upgrade script
15 files changed:
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-10^%%-1060209137^general_list.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-13^%%-1348542088^general_upload.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-28^%%-280080464^general_list.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-46^%%-4631413^general_list.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-46^%%-469092292^general_fragment.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%-57^%%-572652379^general_fragment.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%115^%%1154303806^general_view.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%154/%%1542843037/header.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%164/%%1643473877/default.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%457^%%457584570^general_edit.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%514/%%514181353/ajax_template.html.php [deleted file]
interface/main/calendar/modules/PostCalendar/pntemplates/compiled/%%734^%%734677654^general_upload.html.php [deleted file]
library/sql_upgrade_fx.php
sql/4_2_0-to-4_2_1_upgrade.sql
sql/database.sql