refactor(Data Collector)

- Complete review for display_metadata modules
Third-Culture-Software · Sep 16, 2019 · 049c27d · 049c27d
1 parent 6fcba2b
commit 049c27d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 34 deletions.
diff --git a/client/src/modules/reports/reports.routes.js b/client/src/modules/reports/reports.routes.js
@@ -38,11 +38,8 @@ angular.module('bhima.routes')
       'debtorSummary',
       'clientDebts',
       'clientSupport',
-<<<<<<< e69e08424d13e936001d44e1024f0f26dafab130
       'analysisAuxiliaryCash',
-=======
       'dataKit',
->>>>>>> Rebase with master steep 4
     ];
 
     $stateProvider

diff --git a/server/models/bhima.sql b/server/models/bhima.sql
@@ -132,38 +132,15 @@ INSERT INTO unit VALUES
   (245, 'Debtor summary report', 'REPORT.DEBTOR_SUMMARY.TITLE', 'Debtor summary report', 144, '/modules/reports/debtorSummary', '/reports/debtorSummary'),
   (246, 'Client debts report', 'TREE.CLIENT_DEBTS_REPORT', 'Client debts report', 144, '/modules/reports/clientDebts', '/reports/clientDebts'),
   (247, 'Client support report', 'TREE.CLIENT_SUPPORT_REPORT', 'Client support report', 144, '/modules/reports/clientSupport', '/reports/clientSupport'),
-<<<<<<< 9d05c2b6b5fea68f7ba286e8b026e73aa8e44196
-<<<<<<< 67ddeef3d26191d24e8eadd2d1bceef6b658e343
   (248, 'Analysis of cashboxes', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE', 'Analysis of auxiliary cashboxes', 144, '/modules/reports/analysisAuxiliaryCash', '/reports/analysisAuxiliaryCash'),
   (249, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'),
   (250, 'Fill Form', 'TREE.FILL_FORM', '', 249, '/modules/fill_form', '/fill_form'),
   (251, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 249, '/modules/display_metadata', '/display_metadata'),
-  (251, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 249, '/modules/data_kit', '/data_kit'),
-  (252, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 251, '/modules/data_collector_management', '/data_collector_management'),
-  (253, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 251, '/modules/choices_list_management', '/choices_list_management'),
-  (254, 'Survey Form', 'TREE.SURVEY_FORM', '', 251, '/modules/survey_form', '/survey_form'),  
-  (255, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit');
-
-=======
-  (248, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'),
-  (249, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 248, '/modules/data_collector_management', '/data_collector_management'),
-  (250, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 248, '/modules/choices_list_management', '/choices_list_management'),
-  (251, 'Survey Form', 'TREE.SURVEY_FORM', '', 248, '/modules/survey_form', '/survey_form'),
-  (252, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'),
-  (253, 'Fill Form', 'TREE.FILL_FORM', '', 252, '/modules/fill_form', '/fill_form'),
-  (254, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 252, '/modules/display_metadata', '/display_metadata'),
-  (255, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit');
->>>>>>> Fix and Resolve Conflict
-=======
-  (248, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'),
-  (249, 'Fill Form', 'TREE.FILL_FORM', '', 248, '/modules/fill_form', '/fill_form'),
-  (250, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 248, '/modules/display_metadata', '/display_metadata'),
-  (251, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'),
-  (252, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 248, '/modules/data_kit', '/data_kit'),
+  (252, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 249, '/modules/data_kit', '/data_kit'),
   (253, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 252, '/modules/data_collector_management', '/data_collector_management'),
   (254, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 252, '/modules/choices_list_management', '/choices_list_management'),
-  (255, 'Survey Form', 'TREE.SURVEY_FORM', '', 252, '/modules/survey_form', '/survey_form');
->>>>>>> improvement(Data Collector)
+  (255, 'Survey Form', 'TREE.SURVEY_FORM', '', 252, '/modules/survey_form', '/survey_form'),  
+  (256, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit');
 
 -- Reserved system account type
 INSERT INTO `account_category` VALUES
@@ -219,12 +196,8 @@ INSERT INTO `report` (`id`, `report_key`, `title_key`) VALUES
   (35, 'debtorSummary', 'REPORT.DEBTOR_SUMMARY.TITLE'),
   (36, 'clientDebts', 'REPORT.CLIENT_SUMMARY.TITLE'),
   (37, 'clientSupport', 'REPORT.CLIENT_SUPPORT.TITLE'),
-<<<<<<< 67ddeef3d26191d24e8eadd2d1bceef6b658e343
-  (38, 'analysisAuxiliaryCash', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE');
+  (38, 'analysisAuxiliaryCash', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE'),
   (39, 'dataKit', 'TREE.DATA_KIT_REPORT');
-=======
-  (38, 'dataKit', 'TREE.DATA_KIT_REPORT');
->>>>>>> Fix and Resolve Conflict
 
 -- Supported Languages
 INSERT INTO `language` VALUES