From de2d70270c96827fad95a93a0fbbf624adee0106 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:11:05 +0100 Subject: [PATCH 01/30] Resolve Conflict with branch master --- client/src/i18n/en/form.json | 2 + client/src/i18n/en/tree.json | 2 + client/src/i18n/fr/form.json | 2 + client/src/i18n/fr/tree.json | 2 + client/src/js/services/color.js | 142 +++++++++++++++++- .../data_collector_management.html | 45 ++++++ .../data_collector_management.js | 126 ++++++++++++++++ .../data_collector_management.routes.js | 42 ++++++ .../data_collector_management.service.js | 17 +++ .../data_collector_management.modals.html | 98 ++++++++++++ .../data_collector_management.modals.js | 74 +++++++++ .../templates/action.cell.html | 28 ++++ .../templates/color.cell.html | 3 + .../templates/consultation.cell.html | 20 +++ .../templates/is_related_patient.cell.html | 5 + .../templates/is_related_patient.tmpl.html | 7 + server/config/routes.js | 12 ++ .../admin/dataCollectorManagement.js | 127 ++++++++++++++++ server/models/bhima.sql | 14 +- server/models/schema.sql | 10 ++ .../dataCollectorManagement.page.js | 78 ++++++++++ .../dataCollectorManagement.spec.js | 39 +++++ test/integration/dataCollectorManagement.js | 75 +++++++++ 23 files changed, 967 insertions(+), 3 deletions(-) create mode 100644 client/src/modules/data_collector_management/data_collector_management.html create mode 100644 client/src/modules/data_collector_management/data_collector_management.js create mode 100644 client/src/modules/data_collector_management/data_collector_management.routes.js create mode 100644 client/src/modules/data_collector_management/data_collector_management.service.js create mode 100644 client/src/modules/data_collector_management/modals/data_collector_management.modals.html create mode 100644 client/src/modules/data_collector_management/modals/data_collector_management.modals.js create mode 100644 client/src/modules/data_collector_management/templates/action.cell.html create mode 100644 client/src/modules/data_collector_management/templates/color.cell.html create mode 100644 client/src/modules/data_collector_management/templates/consultation.cell.html create mode 100644 client/src/modules/data_collector_management/templates/is_related_patient.cell.html create mode 100644 client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html create mode 100644 server/controllers/admin/dataCollectorManagement.js create mode 100644 test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js create mode 100644 test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js create mode 100644 test/integration/dataCollectorManagement.js diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index 5805568aeb..6338b1e428 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -180,6 +180,7 @@ "IS_DISCOUNT": "Is it a deduction or an addition?", "IS_MEMBERSHIP_FEE": "Is it a membership fee?", "IS_PERCENT" : "This rubric is expressed in Percentage", + "IS_RELATED_PATIENT": "Is related to the patient", "IS_TAX" : "Is it a Tax?", "ITEMS_FULL": "There are no additional inventory items that be assigned to this invoice.", "LOADING": "Loading", @@ -706,6 +707,7 @@ "VALUE": "Value", "VARIABLE_CHARGE": "Variable cost", "VARIANCE" : "Variance", + "VERSION": "Version", "VILLAGE": "Village/Township", "VILLAGE_NAME": "Village/Township Name", "VILLE": "Township/Commune", diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index f2ef6910f2..f73ac4a7b5 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -28,6 +28,8 @@ "CREDIT_NOTE" : "Credit Note", "CREDITOR_GROUP" : "Creditor Group Management", "CURRENCY" : "Currency", + "DATA_COLLECTOR_MANAGEMENT": "Data Collector Management", + "DATA_KIT": "Data collection kit", "DEPARTMENT_MANAGEMENT" : "Department Management", "DEBTOR_GROUP" : "Debtor Group Management", "DEPOTS" : "Depots", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 2040242a4c..48724271be 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -181,6 +181,7 @@ "IS_DISCOUNT": "Est ce une déduction ou bien une addition ?", "IS_MEMBERSHIP_FEE": "Est ce une cotisation ?", "IS_PERCENT" : "Cette rubrique s'exprime en Pourcentage", + "IS_RELATED_PATIENT": "Est liée au patient", "IS_TAX" : "Est ce une taxe", "LOADING": "Chargement en cours", "MAX_LOT_REACHED": "Lot maximal atteint", @@ -707,6 +708,7 @@ "VALUE": "Valeur", "VARIABLE_CHARGE": "Charge variable", "VARIANCE" : "Variance", + "VERSION": "Version", "VILLAGE": "Village/Commune", "VILLAGE_NAME": "Nom du Village/Commune", "VILLE": "Ville/Commune", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index 15c9af9b2f..bdcaa40d21 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -28,6 +28,8 @@ "CREDIT_NOTE":"Note de Crédit", "CREDITOR_GROUP":"Gestion des Groupes Créditeurs", "CURRENCY":"Monnaie", + "DATA_COLLECTOR_MANAGEMENT": "Gestion des collecteurs de données", + "DATA_KIT": "Kit de collecte de données", "DEPARTMENT_MANAGEMENT" : "Gestion des Departements", "DEBTOR_GROUP":"Gestion des Groupes Débiteurs", "DEPOTS":"Dépôts", diff --git a/client/src/js/services/color.js b/client/src/js/services/color.js index be9343393b..17cfb87ac6 100644 --- a/client/src/js/services/color.js +++ b/client/src/js/services/color.js @@ -17,6 +17,146 @@ function ColorService($translate) { { name : $translate.instant('COLORS.MAROON'), value : '#800000' }, { name : $translate.instant('COLORS.CRIMSON'), value : '#dc143c' }, { name : $translate.instant('COLORS.BLUEVIOLET'), value : '#8A2BE2' }, - ]; + { name : $translate.instant('COLORS.AQUA'), value : '#00ffff' }, + { name : $translate.instant('COLORS.GRAY'), value : '#808080' }, + { name : $translate.instant('COLORS.FORESTGREEN'), value : '#228b22' }, + { name : $translate.instant('COLORS.LIME'), value : '#00ff00' }, + { name : $translate.instant('COLORS.RED'), value : '#ff0000' }, + { name : $translate.instant('COLORS.YELLOW'), value : '#ffff00' }, + { name : $translate.instant('COLORS.YELLOWGREEN'), value : '#9acd32' }, + { name : $translate.instant('COLORS.SLATEBLUE'), value : '#6a5acd' }, + { name : $translate.instant('COLORS.MAROON'), value : '#800000' }, + { name : $translate.instant('COLORS.CRIMSON'), value : '#dc143c' }, + { name : $translate.instant('COLORS.BLUEVIOLET'), value : '#8A2BE2' }, + { name : 'aliceblue', value : '#F0F8FF'}, + { name : 'antiquewhite', value : '#FAEBD7'}, + { name : 'aquamarine', value : '#7FFFD4'}, + { name : 'azure', value : '#F0FFFF'}, + { name : 'beige', value : '#F5F5DC'}, + { name : 'bisque', value : '#FFE4C4'}, + { name : 'blanchedalmond', value : '#FFEBCD'}, + { name : 'blue', value : '#0000FF'}, + { name : 'brown', value : '#A52A2A'}, + { name : 'burlywood', value : '#DEB887'}, + { name : 'cadetblue', value : '#5F9EA0'}, + { name : 'chartreuse', value : '#7FFF00'}, + { name : 'chocolate', value : '#D2691E'}, + { name : 'coral', value : '#FF7F50'}, + { name : 'cornflowerblue', value : '#6495ED'}, + { name : 'cornsilk', value : '#FFF8DC'}, + { name : 'cyan', value : '#00FFFF'}, + { name : 'darkblue', value : '#00008B'}, + { name : 'darkcyan', value : '#008B8B'}, + { name : 'darkgoldenrod', value : '#B8860B'}, + { name : 'darkgray', value : '#A9A9A9'}, + { name : 'darkgreen', value : '#006400'}, + { name : 'darkkhaki', value : '#BDB76B'}, + { name : 'darkmagenta', value : '#8B008B'}, + { name : 'darkolivegreen', value : '#556B2F'}, + { name : 'darkorange', value : '#FF8C00'}, + { name : 'darkorchid', value : '#9932CC'}, + { name : 'darkred', value : '#8B0000'}, + { name : 'darksalmon', value : '#E9967A'}, + { name : 'darkseagreen', value : '#8FBC8F'}, + { name : 'darkslateblue', value : '#483D8B'}, + { name : 'darkslategray', value : '#2F4F4F'}, + { name : 'darkturquoise', value : '#00CED1'}, + { name : 'darkviolet', value : '#9400D3'}, + { name : 'deeppink', value : '#FF1493'}, + { name : 'deepskyblue', value : '#00BFFF'}, + { name : 'dimgray', value : '#696969'}, + { name : 'dodgerblue', value : '#1E90FF'}, + { name : 'firebrick', value : '#B22222'}, + { name : 'floralwhite', value : '#FFFAF0'}, + { name : 'fuchsia', value : '#FF00FF'}, + { name : 'gainsboro', value : '#DCDCDC'}, + { name : 'ghostwhite', value : '#F8F8FF'}, + { name : 'gold', value : '#FFD700'}, + { name : 'goldenrod', value : '#DAA520'}, + { name : 'gray', value : '#808080'}, + { name : 'green', value : '#008000'}, + { name : 'greenyellow', value : '#ADFF2F'}, + { name : 'honeydew', value : '#F0FFF0'}, + { name : 'hotpink', value : '#FF69B4'}, + { name : 'indianred', value : '#CD5C5C'}, + { name : 'indigo', value : '#4B0082'}, + { name : 'ivory', value : '#FFFFF0'}, + { name : 'khaki', value : '#F0E68C'}, + { name : 'lavender', value : '#E6E6FA'}, + { name : 'lavenderblush', value : '#FFF0F5'}, + { name : 'lawngreen', value : '#7CFC00'}, + { name : 'lemonchiffon', value : '#FFFACD'}, + { name : 'lightblue', value : '#ADD8E6'}, + { name : 'lightcoral', value : '#F08080'}, + { name : 'lightcyan', value : '#E0FFFF'}, + { name : 'lightgoldenrodyellow', value : '#FAFAD2'}, + { name : 'lightgreen', value : '#90EE90'}, + { name : 'lightgrey', value : '#D3D3D3'}, + { name : 'lightpink', value : '#FFB6C1'}, + { name : 'lightsalmon', value : '#FFA07A'}, + { name : 'lightseagreen', value : '#20B2AA'}, + { name : 'lightskyblue', value : '#87CEFA'}, + { name : 'lightslategray', value : '#778899'}, + { name : 'lightsteelblue', value : '#B0C4DE'}, + { name : 'lightyellow', value : '#FFFFE0'}, + { name : 'limegreen', value : '#32CD32'}, + { name : 'linen', value : '#FAF0E6'}, + { name : 'magenta', value : '#FF00FF'}, + { name : 'mediumaquamarine', value : '#66CDAA'}, + { name : 'mediumblue', value : '#0000CD'}, + { name : 'mediumorchid', value : '#BA55D3'}, + { name : 'mediumpurple', value : '#9370DB'}, + { name : 'mediumseagreen', value : '#3CB371'}, + { name : 'mediumslateblue', value : '#7B68EE'}, + { name : 'mediumspringgreen', value : '#00FA9A'}, + { name : 'mediumturquoise', value : '#48D1CC'}, + { name : 'mediumvioletred', value : '#C71585'}, + { name : 'midnightblue', value : '#191970'}, + { name : 'mintcream', value : '#F5FFFA'}, + { name : 'mistyrose', value : '#FFE4E1'}, + { name : 'moccasin', value : '#FFE4B5'}, + { name : 'navajowhite', value : '#FFDEAD'}, + { name : 'navy', value : '#000080'}, + { name : 'oldlace', value : '#FDF5E6'}, + { name : 'olive', value : '#808000'}, + { name : 'olivedrab', value : '#6B8E23'}, + { name : 'orange', value : '#FFA500'}, + { name : 'orangered', value : '#FF4500'}, + { name : 'orchid', value : '#DA70D6'}, + { name : 'palegoldenrod', value : '#EEE8AA'}, + { name : 'palegreen', value : '#98FB98'}, + { name : 'paleturquoise ', value : '#AFEEEE'}, + { name : 'palevioletred', value : '#DB7093'}, + { name : 'papayawhip', value : '#FFEFD5'}, + { name : 'peachpuff', value : '#FFDAB9'}, + { name : 'peru', value : '#CD853F'}, + { name : 'pink', value : '#FFC0CB'}, + { name : 'plum', value : '#DDA0DD'}, + { name : 'powderblue', value : '#B0E0E6'}, + { name : 'purple', value : '#800080'}, + { name : 'rosybrown', value : '#BC8F8F'}, + { name : 'royalblue', value : '#4169E1'}, + { name : 'saddlebrown', value : '#8B4513'}, + { name : 'salmon', value : '#FA8072'}, + { name : 'sandybrown', value : '#F4A460'}, + { name : 'seagreen', value : '#2E8B57'}, + { name : 'seashell', value : '#FFF5EE'}, + { name : 'sienna', value : '#A0522D'}, + { name : 'silver', value : '#C0C0C0'}, + { name : 'skyblue', value : '#87CEEB'}, + { name : 'slategray', value : '#708090'}, + { name : 'snow', value : '#FFFAFA'}, + { name : 'springgreen', value : '#00FF7F'}, + { name : 'steelblue', value : '#4682B4'}, + { name : 'tan', value : '#D2B48C'}, + { name : 'teal', value : '#008080'}, + { name : 'thistle', value : '#D8BFD8'}, + { name : 'tomato', value : '#FF6347'}, + { name : 'turquoise', value : '#40E0D0'}, + { name : 'violet', value : '#EE82EE'}, + { name : 'wheat', value : '#F5DEB3'}, + { name : 'white', value : '#FFFFFF'}, + { name : 'whitesmoke', value : '#F5F5F5'}]; + return service; } diff --git a/client/src/modules/data_collector_management/data_collector_management.html b/client/src/modules/data_collector_management/data_collector_management.html new file mode 100644 index 0000000000..6808ce570a --- /dev/null +++ b/client/src/modules/data_collector_management/data_collector_management.html @@ -0,0 +1,45 @@ +
+
+
    +
  1. TREE.ADMIN
    2. +
  2. TREE.DATA_COLLECTOR_MANAGEMENT
    3. +
+ +
+
+ +
+ +
+ +
+
+
+
+ + +
+
+
+ + + +
+
+
diff --git a/client/src/modules/data_collector_management/data_collector_management.js b/client/src/modules/data_collector_management/data_collector_management.js new file mode 100644 index 0000000000..58c14c31ea --- /dev/null +++ b/client/src/modules/data_collector_management/data_collector_management.js @@ -0,0 +1,126 @@ +angular.module('bhima.controllers') + .controller('DataCollectorManagementController', DataCollectorManagementController); + +DataCollectorManagementController.$inject = [ + '$state', 'DataCollectorManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', +]; + +/** + * Data Collector Management Controller + * This module is responsible for handling the CRUD operation on Data Collector Management + */ + +function DataCollectorManagementController($state, DataCollectorManagement, Notify, uiGridConstants, ModalService) { + const vm = this; + vm.gridApi = {}; + vm.filterEnabled = false; + vm.toggleFilter = toggleFilter; + + // options for the UI grid + vm.gridOptions = { + appScopeProvider : vm, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + enableSorting : true, + onRegisterApi : onRegisterApiFn, + columnDefs : [ + { + field : 'label', + width : 300, + displayName : 'FORM.LABELS.DESIGNATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'description', + displayName : 'FORM.LABELS.DETAILS', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'version_number', + displayName : 'FORM.LABELS.VERSION', + width : 100, + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'is_related_patient', + displayName : 'FORM.INFO.IS_RELATED_PATIENT', + width : 300, + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/data_collector_management/templates/is_related_patient.cell.html', + }, + { + field : 'color', + displayName : '', + width : 100, + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/data_collector_management/templates/color.cell.html', + }, + { + field : 'action', + displayName : '', + width : 100, + enableFiltering : 'false', + cellTemplate : '/modules/data_collector_management/templates/action.cell.html', + }, + ], + }; + function onRegisterApiFn(gridApi) { + vm.gridApi = gridApi; + } + + function toggleFilter() { + vm.filterEnabled = !vm.filterEnabled; + vm.gridOptions.enableFiltering = vm.filterEnabled; + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + // bind methods + vm.edit = edit; + vm.remove = remove; + + function edit(dataCollectorManagement) { + $state.go('data_collector_management.edit', { id : dataCollectorManagement.id }); + } + + function remove(id) { + ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') + .then(() => { + DataCollectorManagement.delete(id) + .then(() => { + Notify.success('FORM.INFO.DELETE_SUCCESS'); + loadGrid(); + }) + .catch(Notify.handleError); + }); + } + function handleError(error) { + vm.hasError = true; + Notify.handleError(error); + } + + // load user grid + function loadGrid() { + toggleLoadingIndicator(); + vm.hasError = false; + vm.loading = true; + + DataCollectorManagement.read() + .then((dataCollectorManagement) => { + vm.gridOptions.data = dataCollectorManagement; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + + function toggleLoadingIndicator() { + vm.loading = false; + } + + loadGrid(); +} diff --git a/client/src/modules/data_collector_management/data_collector_management.routes.js b/client/src/modules/data_collector_management/data_collector_management.routes.js new file mode 100644 index 0000000000..875fac9f2b --- /dev/null +++ b/client/src/modules/data_collector_management/data_collector_management.routes.js @@ -0,0 +1,42 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('data_collector_management', { + url : '/data_collector_management', + controller : 'DataCollectorManagementController as DataCollectorManagementCtrl', + templateUrl : 'modules/data_collector_management/data_collector_management.html', + }) + + .state('data_collector_management.create', { + url : '/create', + params : { + data_collector_management : { value : null }, + creating : { value : true }, + }, + onEnter : ['$uibModal', dataCollectorManagementModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('data_collector_management.edit', { + url : '/:id/edit', + params : { + data_collector_management : { value : null }, + creating : { value : false }, + }, + onEnter : ['$uibModal', dataCollectorManagementModal], + onExit : ['$uibModalStack', closeModal], + }); + }]); + +function dataCollectorManagementModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/data_collector_management/modals/data_collector_management.modals.html', + controller : 'DataCollectorManagementModalController as DataCollectorManagementModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/data_collector_management/data_collector_management.service.js b/client/src/modules/data_collector_management/data_collector_management.service.js new file mode 100644 index 0000000000..728b941ae6 --- /dev/null +++ b/client/src/modules/data_collector_management/data_collector_management.service.js @@ -0,0 +1,17 @@ +angular.module('bhima.services') + .service('DataCollectorManagementService', DataCollectorManagementService); + +DataCollectorManagementService.$inject = ['PrototypeApiService']; + +/** + * @class DataCollectorManagementService + * @extends PrototypeApiService + * + * @description + * Encapsulates common requests to the /data_collector_management/ URL. + */ +function DataCollectorManagementService(Api) { + const service = new Api('/data_collector_management/'); + + return service; +} diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html new file mode 100644 index 0000000000..a24808b5af --- /dev/null +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -0,0 +1,98 @@ +
+
+
    +
  1. TREE.ADMIN
    2. + +
  2. + TREE.DATA_COLLECTOR_MANAGEMENT + + +
    3. +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ + +
+ +
+ +
+
+
+
+
+ +
+ COO {{ DataCollectorManagementModalCtrl.dataCollector.color }} + + + + {{$select.selected.name}} + + + {{ val.name }} + +
+ +
+ +
+
+ +
+

+ FORM.INFO.NO_CHANGE +

+ +

+ FORM.ERRORS.GENERIC +

+ + + + + FORM.BUTTONS.SUBMIT + +
+
diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.js b/client/src/modules/data_collector_management/modals/data_collector_management.modals.js new file mode 100644 index 0000000000..dc8ca34467 --- /dev/null +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.js @@ -0,0 +1,74 @@ +angular.module('bhima.controllers') + .controller('DataCollectorManagementModalController', DataCollectorManagementModalController); + +DataCollectorManagementModalController.$inject = [ + '$state', 'DataCollectorManagementService', 'NotifyService', 'appcache', 'ColorService', +]; + +/** + * Data Collector Management Modal Controller + */ + +function DataCollectorManagementModalController($state, DataCollectorManagement, Notify, AppCache, Color) { + const vm = this; + const cache = AppCache('AccountReferenceModal'); + + vm.dataCollector = {}; + vm.stateParams = {}; + vm.colors = Color.list; + + // exposed methods + vm.submit = submit; + vm.closeModal = closeModal; + vm.clear = clear; + + if ($state.params.creating || $state.params.id) { + cache.stateParams = $state.params; + vm.stateParams = cache.stateParams; + } else { + vm.stateParams = cache.stateParams; + } + vm.isCreating = vm.stateParams.creating; + + if (!vm.isCreating) { + DataCollectorManagement.read(vm.stateParams.id) + .then(data => { + vm.dataCollector = data; + }) + .catch(Notify.handleError); + } + + // load Data Collector Management + DataCollectorManagement.read() + .then(dataCollectors => { + vm.dataCollectors = dataCollectors; + }) + .catch(Notify.handleError); + + // submit the data to the server from all two forms (update, create) + function submit(dataCollectorManagementForm) { + vm.hasNoChange = dataCollectorManagementForm.$submitted && dataCollectorManagementForm.$pristine && !vm.isCreating; + if (dataCollectorManagementForm.$invalid) { return null; } + if (!dataCollectorManagementForm.$dirty) { return null; } + + const promise = (vm.isCreating) + ? DataCollectorManagement.create(vm.dataCollector) + : DataCollectorManagement.update(vm.dataCollector.id, vm.dataCollector); + + return promise + .then(() => { + const translateKey = (vm.isCreating) ? 'FORM.INFO.CREATE_SUCCESS' : 'FORM.INFO.UPDATE_SUCCESS'; + Notify.success(translateKey); + $state.go('data_collector_management', null, { reload : true }); + }) + .catch(Notify.handleError); + } + + function clear(value) { + vm.dataCollectors[value] = null; + } + + function closeModal() { + $state.transitionTo('data_collector_management'); + } +} diff --git a/client/src/modules/data_collector_management/templates/action.cell.html b/client/src/modules/data_collector_management/templates/action.cell.html new file mode 100644 index 0000000000..0ba1f5fe49 --- /dev/null +++ b/client/src/modules/data_collector_management/templates/action.cell.html @@ -0,0 +1,28 @@ +
+ + FORM.BUTTONS.ACTIONS + + + + +
diff --git a/client/src/modules/data_collector_management/templates/color.cell.html b/client/src/modules/data_collector_management/templates/color.cell.html new file mode 100644 index 0000000000..a58d95151c --- /dev/null +++ b/client/src/modules/data_collector_management/templates/color.cell.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/client/src/modules/data_collector_management/templates/consultation.cell.html b/client/src/modules/data_collector_management/templates/consultation.cell.html new file mode 100644 index 0000000000..a8fd6d63fc --- /dev/null +++ b/client/src/modules/data_collector_management/templates/consultation.cell.html @@ -0,0 +1,20 @@ +
+ + FORM.BUTTONS.ACTIONS + + + + +
diff --git a/client/src/modules/data_collector_management/templates/is_related_patient.cell.html b/client/src/modules/data_collector_management/templates/is_related_patient.cell.html new file mode 100644 index 0000000000..59b288fbe8 --- /dev/null +++ b/client/src/modules/data_collector_management/templates/is_related_patient.cell.html @@ -0,0 +1,5 @@ +
+
+ FORM.LABELS.YES +
+
diff --git a/client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html b/client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html new file mode 100644 index 0000000000..48ef2fdbf4 --- /dev/null +++ b/client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html @@ -0,0 +1,7 @@ +
+
+ + FORM.LABELS.YES + +
+
\ No newline at end of file diff --git a/server/config/routes.js b/server/config/routes.js index 2b04c462a6..1f88e93d90 100644 --- a/server/config/routes.js +++ b/server/config/routes.js @@ -142,6 +142,10 @@ const lots = require('../controllers/stock/lots'); // todo: the indicator folder must not be inside the finance folder const dashboard = require('../controllers/finance/indicator/dashboard'); const indicatorRerpor = require('../controllers/finance/indicator/dashboard/report'); + +// Data Kit +const dataCollectorManagement = require('../controllers/admin/dataCollectorManagement'); + // expose routes to the server. exports.configure = function configure(app) { debug('configuring routes.'); @@ -975,4 +979,12 @@ exports.configure = function configure(app) { app.post('/cron_email_reports', cronEmailReport.create); app.post('/cron_email_reports/:id', cronEmailReport.send); app.delete('/cron_email_reports/:id', cronEmailReport.remove); + + // API for Data Collector Management routes crud + app.get('/data_collector_management', dataCollectorManagement.list); + app.get('/data_collector_management/:id', dataCollectorManagement.detail); + app.post('/data_collector_management', dataCollectorManagement.create); + app.put('/data_collector_management/:id', dataCollectorManagement.update); + app.delete('/data_collector_management/:id', dataCollectorManagement.delete); + }; diff --git a/server/controllers/admin/dataCollectorManagement.js b/server/controllers/admin/dataCollectorManagement.js new file mode 100644 index 0000000000..be78a61d19 --- /dev/null +++ b/server/controllers/admin/dataCollectorManagement.js @@ -0,0 +1,127 @@ +/** +* Data Collector Management Controller +* +* This controller exposes an API to the client for reading and writing Data Collector Management +*/ + +const db = require('../../lib/db'); +const NotFound = require('../../lib/errors/NotFound'); +const FilterParser = require('../../lib/filter'); + +// GET /data_collector_management +function lookupDataCollectorManagement(id) { + const sql = ` + SELECT id, label, description, version_number, color, is_related_patient FROM data_collector_management + WHERE data_collector_management.id = ? + `; + + return db.one(sql, [id]); +} + + +// List +function list(req, res, next) { + const filters = new FilterParser(req.query); + + const sql = `SELECT id, label, description, version_number, color, is_related_patient + FROM data_collector_management`; + + filters.equals('label'); + filters.equals('description'); + filters.equals('version_number'); + filters.equals('is_related_patient'); + filters.setOrder('ORDER BY label ASC'); + filters.setOrder('ORDER BY version_number'); + + const query = filters.applyQuery(sql); + const parameters = filters.parameters(); + + db.exec(query, parameters) + .then((rows) => { + res.status(200).json(rows); + }) + .catch(next) + .done(); +} + +/** +* GET /data_collector_management/:ID +* +* Returns the detail of a single data_collector_management +*/ +function detail(req, res, next) { + const { id } = req.params; + + lookupDataCollectorManagement(id) + .then((record) => { + res.status(200).json(record); + }) + .catch(next) + .done(); +} + + +// POST /data_collector_management +function create(req, res, next) { + const sql = `INSERT INTO data_collector_management SET ?`; + const data = req.body; + + db.exec(sql, [data]) + .then((row) => { + res.status(201).json({ id : row.insertId }); + }) + .catch(next) + .done(); +} + + +// PUT /data_collector_management /:id +function update(req, res, next) { + const sql = `UPDATE data_collector_management SET ? WHERE id = ?;`; + + db.exec(sql, [req.body, req.params.id]) + .then(() => { + return lookupDataCollectorManagement(req.params.id); + }) + .then((record) => { + // all updates completed successfull, return full object to client + res.status(200).json(record); + }) + .catch(next) + .done(); +} + +// DELETE /data_collector_management/:id +function remove(req, res, next) { + const sql = `DELETE FROM data_collector_management WHERE id = ?;`; + + db.exec(sql, [req.params.id]) + .then((row) => { + // if nothing happened, let the client know via a 404 error + if (row.affectedRows === 0) { + throw new NotFound(`Could not find a function with id ${req.params.id}`); + } + + res.status(204).json(); + }) + .catch(next) + .done(); +} + +// get list of dataCollectorManagement +exports.list = list; + +// get details of a dataCollectorManagement +exports.detail = detail; + +// create a new dataCollectorManagement +exports.create = create; + +// update dataCollectorManagement informations +exports.update = update; + +// Delete a dataCollectorManagement +exports.delete = remove; + +// lookup Data Collector Management +exports.lookupDataCollectorManagement = lookupDataCollectorManagement; diff --git a/server/models/bhima.sql b/server/models/bhima.sql index b9df7abe47..31bb1da7f0 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -133,11 +133,16 @@ INSERT INTO unit VALUES (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'), (248, 'Analysis of cashboxes', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE', 'Analysis of auxiliary cashboxes', 144, '/modules/reports/analysisAuxiliaryCash', '/reports/analysisAuxiliaryCash'), +<<<<<<< f8e1631cbe2732b5c563dc66426c38e20c035ebe (249, 'Realized Profit Report', 'TREE.REALIZED_PROFIT_REPORT', 'Realized profit report', 144, '/modules/reports/realizedProfit', '/reports/realizedProfit'), (250, 'Sytem usage statistic', 'REPORT.SYSTEM_USAGE_STAT.TITLE', 'Sytem usage statistic', 144, '/modules/reports/systemUsageStat', '/reports/systemUsageStat'), (251, 'indexes', 'TREE.INDEXES','The payrall-index', 57,'/modules/finance/','/PAYROLL_INDEX_FOLDER'), (252, 'Staffing indexes management','TREE.STAFFING_INDICES_MANAGEMENT','Staffing indices management',251 ,'/modules/payroll/staffing_indice','/staffing_indices'), (253, 'Multiple Payroll by indice','TREE.MULTI_PAYROLL_INDICE','Multiple Payroll (indice)', 251,'/modules/multiple_payroll_indice','/multiple_payroll_indice'); +======= + (249, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), + (250, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'); +>>>>>>> Resolve conflict s1 -- Reserved system account type INSERT INTO `account_category` VALUES @@ -358,8 +363,13 @@ INSERT INTO `indicator_type`(`id`, `text`,`translate_key`)VALUES (3, 'fianance', 'DASHBOARD.FINANCE'); -- cron -INSERT INTO `cron` (`label`, `value`) VALUES +INSERT INTO `cron` (`label`, `value`) VALUES ('CRON.DAILY', '0 1 * * *'), ('CRON.WEEKLY', '0 1 * * 0'), ('CRON.MONTHLY', '0 1 30 * *'), - ('CRON.YEARLY', '0 1 31 12 *'); \ No newline at end of file + ('CRON.YEARLY', '0 1 31 12 *'), + ('CRON.EACH_MINUTE', '* * * * *'); + +-- data_collector_management +INSERT INTO `data_collector_management` (`label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES + ('Fiche Kardex', 'Fiche de consommation Medicament', '1.0', '#E0FFFF', 1); diff --git a/server/models/schema.sql b/server/models/schema.sql index e03ce15cf5..aaf78d756a 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2358,6 +2358,16 @@ CREATE TABLE `staffing_indice_parameters` ( PRIMARY KEY (`uuid`), UNIQUE KEY `payroll_config_id`(`payroll_configuration_id`), FOREIGN KEY (`payroll_configuration_id`) REFERENCES `payroll_configuration` (`id`) +DROP TABLE IF EXISTS `data_collector_management`; +CREATE TABLE `data_collector_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `description` TEXT, + `version_number` INT(11) UNSIGNED NOT NULL, + `color` VARCHAR(8) NULL, + `is_related_patient` TINYINT(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; SET foreign_key_checks = 1; diff --git a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js new file mode 100644 index 0000000000..6d612a9b46 --- /dev/null +++ b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js @@ -0,0 +1,78 @@ +/* global element, by */ +/* eslint */ + +/** + * This class is represents a payroll configuration page in term of structure and + * behaviour so it is a payroll configuration page object + */ + +/* loading grid actions */ +const GA = require('../shared/GridAction'); +const GU = require('../shared/GridUtils'); +const GridRow = require('../shared/GridRow'); +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class DataCollectorManagementPage { + constructor() { + this.gridId = 'data-collector-management-grid'; + this.rubricGrid = element(by.id(this.gridId)); + this.actionLinkColumn = 5; + } + + /** + * simulate the create PayrollConfig button click to show the dialog of creation + */ + async create(dataCollectorManagement) { + await FU.buttons.create(); + await FU.input('DataCollectorManagementModalCtrl.dataCollector.label', dataCollectorManagement.label); + await FU.input('DataCollectorManagementModalCtrl.dataCollector.description', + dataCollectorManagement.description, this.modal); + await FU.input('DataCollectorManagementModalCtrl.dataCollector.version_number', + dataCollectorManagement.version_number, this.modal); + await FU.uiSelect('DataCollectorManagementModalCtrl.dataCollector.color', dataCollectorManagement.color); + await element(by.id('is_related_patient')).click(); + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * block creation without the function name + */ + async errorOnCreate() { + await FU.buttons.create(); + await FU.buttons.submit(); + await FU.validation.error('DataCollectorManagementModalCtrl.dataCollector.label'); + await FU.buttons.cancel(); + } + + /** + * simulate a click on the edit link of a function + */ + async edit(label, updateDataCollector) { + const row = new GridRow(label); + row.dropdown().click(); + row.edit().click(); + + await FU.input('DataCollectorManagementModalCtrl.dataCollector.label', updateDataCollector.label); + await FU.input('DataCollectorManagementModalCtrl.dataCollector.version_number', updateDataCollector.version_number); + await FU.uiSelect('DataCollectorManagementModalCtrl.dataCollector.color', updateDataCollector.color); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * simulate a click on the delete link of a function + */ + async delete(label) { + const row = new GridRow(label); + await row.dropdown().click(); + await row.remove().click(); + + await FU.modal.submit(); + await components.notification.hasSuccess(); + } +} + +module.exports = DataCollectorManagementPage; diff --git a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js new file mode 100644 index 0000000000..34eb57a41f --- /dev/null +++ b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js @@ -0,0 +1,39 @@ +const helpers = require('../shared/helpers'); +const DataCollectorManagement = require('./dataCollectorManagement.page'); + +describe.only('Data Collector Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/data_collector_management')); + + const Page = new DataCollectorManagement(); + + const newDataCollector = { + label : 'Consultations externes', + description : '2. CONSULTATIONS / 2.1. Consultations externes', + version_number : '1', + color : 'burlywood', + is_related_patient : '1', + }; + + const updateDataCollector = { + label : 'Consultations aux urgences', + version_number : '1', + color : 'chartreuse', + }; + + it('successfully creates a new Data Collector Management', async () => { + await Page.create(newDataCollector); + }); + + it('successfully edits a Data Collector Management', async () => { + await Page.edit(newDataCollector.label, updateDataCollector); + }); + + it('don\'t create when incorrect Data Collector Management', async () => { + await Page.errorOnCreate(); + }); + + it('successfully delete a Configuration Payroll Period', async () => { + await Page.delete(updateDataCollector.label); + }); +}); diff --git a/test/integration/dataCollectorManagement.js b/test/integration/dataCollectorManagement.js new file mode 100644 index 0000000000..7bb627ecf9 --- /dev/null +++ b/test/integration/dataCollectorManagement.js @@ -0,0 +1,75 @@ +/* global expect, agent */ +const helpers = require('./helpers'); + +describe('(/data_collector_management) Data Collector Management', () => { + const numDataCollector = 2; + + const newDataCollector = { + label : 'Consultations externes', + description : '2. CONSULTATIONS / 2.1. Consultations externes', + version_number : '1', + color : '#ADD8E6', + is_related_patient : '1', + }; + + const updateAccountReferenceType = { + label : 'Consultations aux urgences', + version_number : '1', + is_related_patient : '0', + }; + + it('POST /data_collector_management add Data Collector Management', () => { + return agent.post('/data_collector_management') + .send(newDataCollector) + .then((res) => { + helpers.api.created(res); + newDataCollector.id = res.body.id; + }) + .catch(helpers.handler); + }); + + it('GET /data_collector_management/:id returns one Data Collector Management as detail', () => { + return agent.get(`/data_collector_management/${newDataCollector.id}`) + .then((res) => { + expect(res).to.have.status(200); + + expect(res).to.be.a('object'); + expect(res.body).to.have.all.keys('id', 'label', 'description', + 'version_number', 'color', 'is_related_patient'); + }) + .catch(helpers.handler); + }); + + it('PUT /data_collector_management/:id updates the newly added Data Collector Management', () => { + return agent.put(`/data_collector_management/${newDataCollector.id}`) + .send(updateAccountReferenceType) + .then((res) => { + expect(res).to.have.status(200); + expect(res).to.be.a('object'); + expect(res.body.id).to.equal(newDataCollector.id); + }) + .catch(helpers.handler); + }); + + it('GET /data_collector_management returns all Data Collector Management', () => { + return agent.get(`/data_collector_management/`) + .then((res) => { + helpers.api.listed(res, numDataCollector); + expect(res.body[0]).to.have.all.keys('id', 'label', 'description', + 'version_number', 'color', 'is_related_patient'); + }) + .catch(helpers.handler); + }); + + it('DELETE /data_collector_management/:id deletes a Data Collector Management', () => { + return agent.delete(`/data_collector_management/${newDataCollector.id}`) + .then((res) => { + helpers.api.deleted(res); + return agent.get(`/data_collector_management/${newDataCollector.id}`); + }) + .then((res) => { + helpers.api.errored(res, 404); + }) + .catch(helpers.handler); + }); +}); From ecbe79fefa50f12e05b844722e7b4bacd1c1b9da Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:13:13 +0100 Subject: [PATCH 02/30] Rebase with branch Master --- client/src/i18n/en/form.json | 6 + client/src/i18n/en/tree.json | 2 + client/src/i18n/fr/form.json | 6 + client/src/i18n/fr/tree.json | 2 + .../src/js/components/bhChoiseListSelect.js | 64 +++++++++ .../choises_list_management.html | 38 ++++++ .../choises_list_management.js | 113 ++++++++++++++++ .../choises_list_management.routes.js | 43 ++++++ .../choises_list_management.service.js | 100 ++++++++++++++ .../choises_list_management.modals.html | 103 +++++++++++++++ .../modals/choises_list_management.modals.js | 84 ++++++++++++ .../templates/action.cell.tmpl.html | 37 ++++++ .../templates/gridLabels.tmpl.html | 12 ++ .../templates/gridName.tmpl.html | 8 ++ .../templates/is_title.tmpl.html | 5 + .../data_collector_management.modals.html | 2 +- .../templates/bhChoiseListSelect.tmpl.html | 31 +++++ server/config/routes.js | 11 +- .../admin/choisesListManagement.js | 125 ++++++++++++++++++ server/models/bhima.sql | 24 ++++ server/models/schema.sql | 14 ++ .../choiseListManagement.page.js | 77 +++++++++++ .../choiseListManagement.spec.js | 44 ++++++ .../dataCollectorManagement.page.js | 8 +- .../dataCollectorManagement.spec.js | 4 +- .../shared/components/bhChoiseListSelect.js | 17 +++ test/end-to-end/shared/components/index.js | 1 + test/integration/choiseListManagement.js | 76 +++++++++++ 28 files changed, 1048 insertions(+), 9 deletions(-) create mode 100644 client/src/js/components/bhChoiseListSelect.js create mode 100644 client/src/modules/choises_list_management/choises_list_management.html create mode 100644 client/src/modules/choises_list_management/choises_list_management.js create mode 100644 client/src/modules/choises_list_management/choises_list_management.routes.js create mode 100644 client/src/modules/choises_list_management/choises_list_management.service.js create mode 100644 client/src/modules/choises_list_management/modals/choises_list_management.modals.html create mode 100644 client/src/modules/choises_list_management/modals/choises_list_management.modals.js create mode 100644 client/src/modules/choises_list_management/templates/action.cell.tmpl.html create mode 100644 client/src/modules/choises_list_management/templates/gridLabels.tmpl.html create mode 100644 client/src/modules/choises_list_management/templates/gridName.tmpl.html create mode 100644 client/src/modules/choises_list_management/templates/is_title.tmpl.html create mode 100644 client/src/modules/templates/bhChoiseListSelect.tmpl.html create mode 100644 server/controllers/admin/choisesListManagement.js create mode 100644 test/end-to-end/choiseListManagement/choiseListManagement.page.js create mode 100644 test/end-to-end/choiseListManagement/choiseListManagement.spec.js create mode 100644 test/end-to-end/shared/components/bhChoiseListSelect.js create mode 100644 test/integration/choiseListManagement.js diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index 6338b1e428..3c3f49e80f 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -178,10 +178,12 @@ "INVOICES": "Invoices", "IS_ASSOCIATED_EMPLOYEE" : "will be associated with the employee ID", "IS_DISCOUNT": "Is it a deduction or an addition?", + "IS_GROUP": "Is it a group", "IS_MEMBERSHIP_FEE": "Is it a membership fee?", "IS_PERCENT" : "This rubric is expressed in Percentage", "IS_RELATED_PATIENT": "Is related to the patient", "IS_TAX" : "Is it a Tax?", + "IS_TITLE": "Is title", "ITEMS_FULL": "There are no additional inventory items that be assigned to this invoice.", "LOADING": "Loading", "MAX_LOT_REACHED": "Max Lot reached", @@ -312,6 +314,7 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Prepayment Amount", "CHARGE": "Cost", + "CHOISE_LIST": "Choise list", "CLIENT": "Client", "CLIENT_ID": "Client ID", "CLIENT_TO_IGNORE": "Client(s) to ignore", @@ -706,6 +709,7 @@ "INDICATOR_HOSPITALIZATION" : "Indicator's hospitalization", "VALUE": "Value", "VARIABLE_CHARGE": "Variable cost", + "VARIABLE_NAME": "Variable Name", "VARIANCE" : "Variance", "VERSION": "Version", "VILLAGE": "Village/Township", @@ -865,6 +869,8 @@ "ROOT_ACCOUNT": "Select a Root Account", "RUBRIC_CONFIGURATION": "Select Rubrics Configuration", "SECTOR": "Select a sector", + "SELECT_GROUP": "Select Group Label", + "SELECT_PARENT": "Select a Parent", "SELECT_PERIOD": "Select a payment period", "SERVICE": "Select a Service", "SEX": "Select a Sex", diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index f73ac4a7b5..af96c386c0 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -23,6 +23,7 @@ "CASHFLOW_BY_SERVICE" : "Cashflow by Service", "CASH_PAYMENT_REGISTRY" : "Cash Payment Registry", "CASH_WINDOW" : "Cash Window", + "CHOISES_LIST_MANAGEMENT" : "Choises List Management", "COMPLEX_JOURNAL_VOUCHER" : "Journal Vouchers", "COST_CENTER_MGMT" : "Cost Center Management", "CREDIT_NOTE" : "Credit Note", @@ -128,6 +129,7 @@ "STOCK_MOVEMENTS" : "Stock Movements", "SUBSIDY" : "Subsidy Management", "STAFFING_INDICES_MANAGEMENT" : "Staffing indices management", + "SURVEY_FORM": "Survey Form", "TRANSACTION_TYPE" : "Transaction Type Management", "TAGS" : "Tags Management", "USERS" : "User Management", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 48724271be..92be20c2e3 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -179,10 +179,12 @@ "ITEMS_FULL": "Il n'y a pas d'articles supplémentaires qui seront affectés à cette facture.", "IS_ASSOCIATED_EMPLOYEE" : "sera associé à l'identifiant de l'employé", "IS_DISCOUNT": "Est ce une déduction ou bien une addition ?", + "IS_GROUP": "Est ce un groupe?", "IS_MEMBERSHIP_FEE": "Est ce une cotisation ?", "IS_PERCENT" : "Cette rubrique s'exprime en Pourcentage", "IS_RELATED_PATIENT": "Est liée au patient", "IS_TAX" : "Est ce une taxe", + "IS_TITLE": "Est ce un titre", "LOADING": "Chargement en cours", "MAX_LOT_REACHED": "Lot maximal atteint", "NO_CHANGE":"Aucun changement n'a été apporté sur le formulaire", @@ -315,6 +317,7 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Total de la Caution", "CHARGE": "Charge", + "CHOISE_LIST": "Liste de choix", "CLIENT": "Client", "CLIENT_ID": "Identifiant client", "CLIENT_TO_IGNORE": "Client(s) à ignorer", @@ -707,6 +710,7 @@ "VALIDATED": "Validé", "VALUE": "Valeur", "VARIABLE_CHARGE": "Charge variable", + "VARIABLE_NAME": "Nom de la variable", "VARIANCE" : "Variance", "VERSION": "Version", "VILLAGE": "Village/Commune", @@ -866,6 +870,8 @@ "RUBRIC_CONFIGURATION": "Sélectionner la configuration des rubriques", "PROJECTS": "Sélection des projets", "SECTOR": "Sélectionner un secteur", + "SELECT_GROUP": "Sélectionner l'étiquette du groupe", + "SELECT_PARENT": "Sélectionner un Parent", "SELECT_PERIOD": "Sélectionner une période de paiement", "SERVICE": "Sélectionner un Service", "SEX": "Sélectionner le sexe", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index bdcaa40d21..c186a0487b 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -23,6 +23,7 @@ "CASHFLOW_BY_SERVICE": "Journal de Ventilation", "CASH_PAYMENT_REGISTRY":"Registre des paiements", "CASH_WINDOW":"Paiements", + "CHOISES_LIST_MANAGEMENT" : "Gestion des listes de choix", "COMPLEX_JOURNAL_VOUCHER":"Ajout de transactions", "COST_CENTER_MGMT":"Centres de coûts", "CREDIT_NOTE":"Note de Crédit", @@ -126,6 +127,7 @@ "STOCK_LOTS":"Lots en stock", "STOCK_VALUE" : "[Stock] Valeur de stock", "STOCK_MOVEMENTS":"Movements de stock", + "SURVEY_FORM": "Formulaires d'enquêtes", "TRANSACTION_TYPE":"Types de Transaction", "TAGS" : "Gestion des étiquettes", "SUBSIDY":"Gestion des subventions", diff --git a/client/src/js/components/bhChoiseListSelect.js b/client/src/js/components/bhChoiseListSelect.js new file mode 100644 index 0000000000..d3bd6edbe3 --- /dev/null +++ b/client/src/js/components/bhChoiseListSelect.js @@ -0,0 +1,64 @@ +angular.module('bhima.components') + .component('bhChoiseListSelect', { + templateUrl : 'modules/templates/bhChoiseListSelect.tmpl.html', + controller : ChoiseListController, + transclude : true, + bindings : { + onSelectCallback : '&', + list : ' { + $ctrl.lists = lists; + }) + .catch(Notify.handleError); + }; + + $ctrl.$onChanges = (changes) => { + if (changes.parentId && changes.parentId.currentValue) { + $ctrl.parentId = parseInt(changes.parentId.currentValue, 10); + + const query = { + is_title : $ctrl.isTitle, + is_group : $ctrl.isGroup, + parent : $ctrl.parentId || null, + group_label : $ctrl.groupLabel || null, + }; + + ChoisesList.read(null, query) + .then(lists => { + $ctrl.lists = lists; + }) + .catch(Notify.handleError); + } + }; + + + $ctrl.onSelect = list => $ctrl.onSelectCallback({ list }); +} diff --git a/client/src/modules/choises_list_management/choises_list_management.html b/client/src/modules/choises_list_management/choises_list_management.html new file mode 100644 index 0000000000..d68af8a343 --- /dev/null +++ b/client/src/modules/choises_list_management/choises_list_management.html @@ -0,0 +1,38 @@ +
+
+
    +
  1. TREE.ADMIN
    2. +
  2. TREE.CHOISES_LIST_MANAGEMENT
    3. +
+ +
+
+ +
+ +
+ +
+
+
+
+ + +
+
+
+ + + +
+
+
\ No newline at end of file diff --git a/client/src/modules/choises_list_management/choises_list_management.js b/client/src/modules/choises_list_management/choises_list_management.js new file mode 100644 index 0000000000..ce5e17a36a --- /dev/null +++ b/client/src/modules/choises_list_management/choises_list_management.js @@ -0,0 +1,113 @@ +angular.module('bhima.controllers') + .controller('ChoisesListManagementController', ChoisesListManagementController); + +ChoisesListManagementController.$inject = [ + '$state', 'ChoisesListManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', +]; + +/** + * CHOISES LIST MANAGEMENT Controller + * This module is responsible for handling the CRUD operation on CHOISES LIST MANAGEMENT + */ + +function ChoisesListManagementController($state, ChoisesListManagement, Notify, uiGridConstants, ModalService) { + const vm = this; + vm.gridApi = {}; + vm.filterEnabled = false; + vm.toggleFilter = toggleFilter; + + // options for the UI grid + vm.gridOptions = { + appScopeProvider : vm, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + showTreeExpandNoChildren : false, + enableSorting : true, + onRegisterApi : onRegisterApiFn, + columnDefs : [ + { + field : 'name', + displayName : 'FORM.LABELS.VARIABLE_NAME', + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/choises_list_management/templates/gridName.tmpl.html', + }, + { + field : 'label', + displayName : 'FORM.LABELS.DESIGNATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/choises_list_management/templates/gridLabels.tmpl.html', + }, + { + field : 'is_title', + displayName : 'FORM.LABELS.TITLE', + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/choises_list_management/templates/is_title.tmpl.html', + }, + { + field : 'action', + displayName : '', + enableFiltering : 'false', + cellTemplate : '/modules/choises_list_management/templates/action.cell.tmpl.html', + }, + ], + }; + + function onRegisterApiFn(gridApi) { + vm.gridApi = gridApi; + } + + + function toggleFilter() { + vm.filterEnabled = !vm.filterEnabled; + vm.gridOptions.enableFiltering = vm.filterEnabled; + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + // bind methods + vm.edit = edit; + vm.remove = remove; + + function edit(choisesListManagement) { + $state.go('choises_list_management.edit', { id : choisesListManagement.id }); + } + + function remove(id) { + ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') + .then(() => { + ChoisesListManagement.delete(id) + .then(() => { + Notify.success('FORM.INFO.DELETE_SUCCESS'); + loadGrid(); + }) + .catch(Notify.handleError); + }); + } + function handleError(error) { + vm.hasError = true; + Notify.handleError(error); + } + + // load user grid + function loadGrid() { + vm.hasError = false; + vm.loading = true; + + ChoisesListManagement.read() + .then((data) => { + const dataTree = ChoisesListManagement.formatStore(data); + vm.gridOptions.data = dataTree; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + + function toggleLoadingIndicator() { + vm.loading = false; + } + + loadGrid(); +} diff --git a/client/src/modules/choises_list_management/choises_list_management.routes.js b/client/src/modules/choises_list_management/choises_list_management.routes.js new file mode 100644 index 0000000000..66b75993d6 --- /dev/null +++ b/client/src/modules/choises_list_management/choises_list_management.routes.js @@ -0,0 +1,43 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('choises_list_management', { + url : '/choises_list_management', + controller : 'ChoisesListManagementController as ChoisesListManagementCtrl', + templateUrl : 'modules/choises_list_management/choises_list_management.html', + }) + + .state('choises_list_management.create', { + url : '/create', + params : { + choises_list_management : { value : null }, + creating : { value : true }, + parentId : { value : null }, + }, + onEnter : ['$uibModal', choisesListManagementModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('choises_list_management.edit', { + url : '/:id/edit', + params : { + choises_list_management : { value : null }, + creating : { value : false }, + }, + onEnter : ['$uibModal', choisesListManagementModal], + onExit : ['$uibModalStack', closeModal], + }); + }]); + +function choisesListManagementModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/choises_list_management/modals/choises_list_management.modals.html', + controller : 'ChoisesListManagementModalController as ChoisesListManagementModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/choises_list_management/choises_list_management.service.js b/client/src/modules/choises_list_management/choises_list_management.service.js new file mode 100644 index 0000000000..831eb98642 --- /dev/null +++ b/client/src/modules/choises_list_management/choises_list_management.service.js @@ -0,0 +1,100 @@ +angular.module('bhima.services') + .service('ChoisesListManagementService', ChoisesListManagementService); + +ChoisesListManagementService.$inject = ['PrototypeApiService']; + +/** + * @class ChoisesListManagementService + * @extends PrototypeApiService + * + * @description + * Encapsulates common requests to the /choises_list_management/ URL. + */ +function ChoisesListManagementService(Api) { + const service = new Api('/choises_list_management/'); + + service.formatStore = formatStore; + + function formatStore(data) { + const storeData = order(data); + return storeData; + } + + /** + * @method order + * + * @description + * Creates a proper choise list ordering by first creating an choise list tree and + * then flattening in place. + * + * @param {Array} lists - a list of choises lists objects + * @returns {Array} - the properly ordered list of choises lists objects + */ + + function order(data) { + // NOTE: we assume the root node is 0 + const ROOT_NODE = 0; + + // build the choises list tree + const tree = getChildren(data, ROOT_NODE); + + // return a flattened tree (in order) + return flatten(tree); + } + + /** + * @method getChildren + * + * @description + * This method builds a tree data structure of Choises lists and children of a + * specified parentId. + * + * @returns {Array} - an array of children + */ + function getChildren(data, parentId) { + // base case: There are no child Choises list + if (data.length === 0) { return null; } + + // returns all List where the parent is the + // parentId + const children = data.filter(handleParent); + + // recursively call getChildren on all child accounts + // and attach them as childen of their parent account + children.forEach(handleChildren); + + function handleParent(choiseList) { + return choiseList.parent === parentId; + } + + function handleChildren(choiseList) { + choiseList.children = getChildren(data, choiseList.id); + } + + return children; + } + + /** + * @method flatten + * + * @description + * Flattens a tree data structure (must have `children` property) in place. + * + * @returns {Array} - the flattened array + */ + function flatten(_tree, _depth) { + const tree = _tree || []; + let depth = (!angular.isDefined(_depth) || Number.isNaN(_depth)) ? -1 : _depth; + depth += 1; + + function handleTreeLevel(array, node) { + const items = [node].concat(node.children ? flatten(node.children, depth) : []); + node.$$treeLevel = depth; + return array.concat(items); + } + + return tree.reduce(handleTreeLevel, []); + } + + return service; +} diff --git a/client/src/modules/choises_list_management/modals/choises_list_management.modals.html b/client/src/modules/choises_list_management/modals/choises_list_management.modals.html new file mode 100644 index 0000000000..b9905fddc9 --- /dev/null +++ b/client/src/modules/choises_list_management/modals/choises_list_management.modals.html @@ -0,0 +1,103 @@ +
+
+
    +
  1. TREE.ADMIN
    2. + +
  2. + TREE.CHOISES_LIST_MANAGEMENT + +
    3. +
  3. + TREE.CHOISES_LIST_MANAGEMENT + +
    4. +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ + + + + + + + + + +
+ +
+ + +
+ +
+ +
+ +
+

+ FORM.INFO.NO_CHANGE +

+ +

+ FORM.ERRORS.GENERIC +

+ + + + + FORM.BUTTONS.SUBMIT + +
+
\ No newline at end of file diff --git a/client/src/modules/choises_list_management/modals/choises_list_management.modals.js b/client/src/modules/choises_list_management/modals/choises_list_management.modals.js new file mode 100644 index 0000000000..dfa7922343 --- /dev/null +++ b/client/src/modules/choises_list_management/modals/choises_list_management.modals.js @@ -0,0 +1,84 @@ +angular.module('bhima.controllers') + .controller('ChoisesListManagementModalController', ChoisesListManagementModalController); + +ChoisesListManagementModalController.$inject = [ + '$state', 'ChoisesListManagementService', 'NotifyService', 'appcache', +]; + +/** + * CHOISES LIST MANAGEMENT Modal Controller + */ + +function ChoisesListManagementModalController($state, ChoisesListManagement, Notify, AppCache) { + const vm = this; + const cache = AppCache('ChoisesListManagementModal'); + + vm.choise = {}; + vm.stateParams = {}; + + // exposed methods + vm.submit = submit; + vm.closeModal = closeModal; + vm.clear = clear; + vm.onSelectParent = onSelectParent; + vm.onSelectGroup = onSelectGroup; + + if ($state.params.creating || $state.params.id) { + cache.stateParams = $state.params; + vm.stateParams = cache.stateParams; + vm.choise.parent = $state.params.parentId; + } else { + vm.stateParams = cache.stateParams; + } + vm.isCreating = vm.stateParams.creating; + + if (!vm.isCreating) { + ChoisesListManagement.read(vm.stateParams.id) + .then(data => { + vm.choise = data; + }) + .catch(Notify.handleError); + } + + // load CHOISES LIST MANAGEMENT + ChoisesListManagement.read() + .then(choisesList => { + vm.choisesList = choisesList; + }) + .catch(Notify.handleError); + + // submit the data to the server from all two forms (update, create) + function submit(choisesListManagementForm) { + vm.hasNoChange = choisesListManagementForm.$submitted && choisesListManagementForm.$pristine && !vm.isCreating; + if (choisesListManagementForm.$invalid) { return null; } + if (!choisesListManagementForm.$dirty) { return null; } + + const promise = (vm.isCreating) + ? ChoisesListManagement.create(vm.choise) + : ChoisesListManagement.update(vm.choise.id, vm.choise); + + return promise + .then(() => { + const translateKey = (vm.isCreating) ? 'FORM.INFO.CREATE_SUCCESS' : 'FORM.INFO.UPDATE_SUCCESS'; + Notify.success(translateKey); + $state.go('choises_list_management', null, { reload : true }); + }) + .catch(Notify.handleError); + } + + function onSelectParent(parent) { + vm.choise.parent = parent.id; + } + + function onSelectGroup(group) { + vm.choise.group_label = group.id; + } + + function clear(value) { + vm.choise[value] = 0; + } + + function closeModal() { + $state.transitionTo('choises_list_management'); + } +} diff --git a/client/src/modules/choises_list_management/templates/action.cell.tmpl.html b/client/src/modules/choises_list_management/templates/action.cell.tmpl.html new file mode 100644 index 0000000000..202a12548a --- /dev/null +++ b/client/src/modules/choises_list_management/templates/action.cell.tmpl.html @@ -0,0 +1,37 @@ +
+ + + FORM.BUTTONS.ACTIONS + + + + + + + + + FORM.LABELS.LOCKED + + +
diff --git a/client/src/modules/choises_list_management/templates/gridLabels.tmpl.html b/client/src/modules/choises_list_management/templates/gridLabels.tmpl.html new file mode 100644 index 0000000000..a9775414d8 --- /dev/null +++ b/client/src/modules/choises_list_management/templates/gridLabels.tmpl.html @@ -0,0 +1,12 @@ +
+ + {{ row.entity.label}} + + + {{ row.entity.label}} + + + + +
diff --git a/client/src/modules/choises_list_management/templates/gridName.tmpl.html b/client/src/modules/choises_list_management/templates/gridName.tmpl.html new file mode 100644 index 0000000000..32f0a9ccb5 --- /dev/null +++ b/client/src/modules/choises_list_management/templates/gridName.tmpl.html @@ -0,0 +1,8 @@ +
+ + {{ row.entity.label}} + + + {{ row.entity.name}} + +
\ No newline at end of file diff --git a/client/src/modules/choises_list_management/templates/is_title.tmpl.html b/client/src/modules/choises_list_management/templates/is_title.tmpl.html new file mode 100644 index 0000000000..6b6045df96 --- /dev/null +++ b/client/src/modules/choises_list_management/templates/is_title.tmpl.html @@ -0,0 +1,5 @@ +
+
+ FORM.LABELS.YES +
+
diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html index a24808b5af..b022321086 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -50,7 +50,7 @@
- COO {{ DataCollectorManagementModalCtrl.dataCollector.color }} + diff --git a/client/src/modules/templates/bhChoiseListSelect.tmpl.html b/client/src/modules/templates/bhChoiseListSelect.tmpl.html new file mode 100644 index 0000000000..3f0a3f3b98 --- /dev/null +++ b/client/src/modules/templates/bhChoiseListSelect.tmpl.html @@ -0,0 +1,31 @@ +
+
+ + + + + + {{ $select.selected.label }} + + + + + + +
+
+
+
+
diff --git a/server/config/routes.js b/server/config/routes.js index 1f88e93d90..09b031c255 100644 --- a/server/config/routes.js +++ b/server/config/routes.js @@ -145,6 +145,7 @@ const indicatorRerpor = require('../controllers/finance/indicator/dashboard/repo // Data Kit const dataCollectorManagement = require('../controllers/admin/dataCollectorManagement'); +const choisesListManagement = require('../controllers/admin/choisesListManagement'); // expose routes to the server. exports.configure = function configure(app) { @@ -985,6 +986,14 @@ exports.configure = function configure(app) { app.get('/data_collector_management/:id', dataCollectorManagement.detail); app.post('/data_collector_management', dataCollectorManagement.create); app.put('/data_collector_management/:id', dataCollectorManagement.update); - app.delete('/data_collector_management/:id', dataCollectorManagement.delete); + app.delete('/data_collector_management/:id', dataCollectorManagement.delete); + + // API for CHOISES LIST MANAGEMENT routes crud + app.get('/choises_list_management', choisesListManagement.list); + app.get('/choises_list_management/:id', choisesListManagement.detail); + app.post('/choises_list_management', choisesListManagement.create); + app.put('/choises_list_management/:id', choisesListManagement.update); + app.delete('/choises_list_management/:id', choisesListManagement.delete); + }; diff --git a/server/controllers/admin/choisesListManagement.js b/server/controllers/admin/choisesListManagement.js new file mode 100644 index 0000000000..03afcbba0d --- /dev/null +++ b/server/controllers/admin/choisesListManagement.js @@ -0,0 +1,125 @@ +/** +* CHOISES LIST MANAGEMENT Controller +* +* This controller exposes an API to the client for reading and writing CHOISES LIST MANAGEMENT +*/ + +const db = require('../../lib/db'); +const NotFound = require('../../lib/errors/NotFound'); +const FilterParser = require('../../lib/filter'); + +// GET /choises_list_management +function lookupChoisesListManagement(id) { + const sql = ` + SELECT id, name, label, fixed, group_label, parent, is_title, is_group + FROM choises_list_management + WHERE choises_list_management.id = ?`; + + return db.one(sql, [id]); +} + +function list(req, res, next) { + const filters = new FilterParser(req.query); + + const sql = ` + SELECT id, name, label, fixed, group_label, parent, is_title, is_group + FROM choises_list_management + `; + + filters.equals('is_title'); + filters.equals('is_group'); + filters.equals('parent'); + filters.equals('group_label'); + filters.setOrder('ORDER BY label'); + + const query = filters.applyQuery(sql); + const parameters = filters.parameters(); + + db.exec(query, parameters) + .then((rows) => { + res.status(200).json(rows); + }) + .catch(next) + .done(); +} + +/** +* GET /choises_list_management/:ID +* +* Returns the detail of a single choises_list_management +*/ +function detail(req, res, next) { + const { id } = req.params; + + lookupChoisesListManagement(id) + .then((record) => { + res.status(200).json(record); + }) + .catch(next) + .done(); +} + + +// POST /choises_list_management +function create(req, res, next) { + const sql = `INSERT INTO choises_list_management SET ?`; + const data = req.body; + // Set 0 (root) like default parent + data.parent = data.parent || 0; + + db.exec(sql, [data]) + .then((row) => { + res.status(201).json({ id : row.insertId }); + }) + .catch(next) + .done(); +} + + +// PUT /choises_list_management /:id +function update(req, res, next) { + const sql = `UPDATE choises_list_management SET ? WHERE id = ?;`; + + db.exec(sql, [req.body, req.params.id]) + .then(() => { + return lookupChoisesListManagement(req.params.id); + }) + .then((record) => { + // all updates completed successfull, return full object to client + res.status(200).json(record); + }) + .catch(next) + .done(); +} + +// DELETE /choises_list_management/:id +function remove(req, res, next) { + const sql = `DELETE FROM choises_list_management WHERE id = ?;`; + + db.exec(sql, [req.params.id]) + .then((row) => { + // if nothing happened, let the client know via a 404 error + if (row.affectedRows === 0) { + throw new NotFound(`Could not find a function with id ${req.params.id}`); + } + + res.status(204).json(); + }) + .catch(next) + .done(); +} + +// get list of choisesListManagement +exports.list = list; + +// get details of a choisesListManagement +exports.detail = detail; + +// create a new choisesListManagement +exports.create = create; + +// update choisesListManagement informations +exports.update = update; + +// Delete a choisesListManagement +exports.delete = remove; diff --git a/server/models/bhima.sql b/server/models/bhima.sql index 31bb1da7f0..ef0b8f5662 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -373,3 +373,27 @@ INSERT INTO `cron` (`label`, `value`) VALUES -- data_collector_management INSERT INTO `data_collector_management` (`label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES ('Fiche Kardex', 'Fiche de consommation Medicament', '1.0', '#E0FFFF', 1); + +-- choises_list_management +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (2, 'm', 'Masculin', 0, 1, 1, 0, 0); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (3, 'f', 'Féminin', 0, 1, 1, 0, 0); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (4, 'pays', 'Pays', 0, 0, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (5, 'province', 'Province', 0, 4, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (6, 'districte', 'Districte', 0, 5, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (7, 'ville', 'Ville', 0, 6, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (8, 'commune', 'Commune', 0, 7, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (9, 'quartier', 'Quartier', 0, 8, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (10, 'rdc', 'RD Congo', 0, 0, 4, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (11, 'kin', 'Kinshasa', 0, 10, 4, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (12, 'mont_amba', 'Mont Amba', 0, 11, 6, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (13, 'lemba', 'Lemba', 0, 12, 8, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (14, 'salongo', 'Salongo', 0, 13, 9, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (15, 'avenue', 'Avenue', 0, 9, 0, 1, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (16, 'bypass', 'By Pass', 0, 14, 15, 0, 0); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (17, 'kalala', 'Kalala', 0, 14, 0, 0, 0); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (18, 'funa', 'Funa', 0, 11, 6, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); +INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); + diff --git a/server/models/schema.sql b/server/models/schema.sql index aaf78d756a..06f6c21301 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2370,4 +2370,18 @@ CREATE TABLE `data_collector_management` ( UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `choises_list_management`; +CREATE TABLE `choises_list_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `fixed` tinyint(1) DEFAULT 0, + `parent` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `group_label` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `is_group` tinyint(1) NOT NULL DEFAULT 0, + `is_title` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `choises_list_management_1` (`label`, `name`, `parent`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + SET foreign_key_checks = 1; diff --git a/test/end-to-end/choiseListManagement/choiseListManagement.page.js b/test/end-to-end/choiseListManagement/choiseListManagement.page.js new file mode 100644 index 0000000000..97d7323f37 --- /dev/null +++ b/test/end-to-end/choiseListManagement/choiseListManagement.page.js @@ -0,0 +1,77 @@ +/* global element, by */ +/* eslint */ + +/** + * This class is represents a Choise List Management page in term of structure and + * behaviour so it is a Choise List Management page object + */ + +/* loading grid actions */ +const GridRow = require('../shared/GridRow'); +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class ChoiseListManagementPage { + constructor() { + this.gridId = 'choises-list-management-grid'; + this.rubricGrid = element(by.id(this.gridId)); + this.actionLinkColumn = 5; + } + + /** + * simulate the create PayrollConfig button click to show the dialog of creation + */ + async create(ChoiseListElement) { + await FU.buttons.create(); + await FU.input('ChoisesListManagementModalCtrl.choise.label', ChoiseListElement.label); + await FU.input('ChoisesListManagementModalCtrl.choise.name', ChoiseListElement.name); + await element(by.id('is_title')).click(); + await element(by.id('is_group')).click(); + + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * block creation without the function name + */ + async errorOnCreate() { + await FU.buttons.create(); + await FU.buttons.submit(); + await FU.validation.error('ChoisesListManagementModalCtrl.choise.label'); + await FU.buttons.cancel(); + } + + /** + * simulate a click on the edit link of a function + */ + async edit(label, updateDataCollector) { + const row = new GridRow(label); + row.dropdown().click(); + row.edit().click(); + + await components.choiseListSelect.set(updateDataCollector.parent, 'parent'); + await components.choiseListSelect.set(updateDataCollector.group_label, 'group_label'); + + await element(by.id('is_title')).click(); + await element(by.id('is_group')).click(); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * simulate a click on the delete link of a function + */ + async delete(label) { + const row = new GridRow(label); + await row.dropdown().click(); + await row.remove().click(); + + await FU.modal.submit(); + await components.notification.hasSuccess(); + } +} + +module.exports = ChoiseListManagementPage; diff --git a/test/end-to-end/choiseListManagement/choiseListManagement.spec.js b/test/end-to-end/choiseListManagement/choiseListManagement.spec.js new file mode 100644 index 0000000000..5d14267002 --- /dev/null +++ b/test/end-to-end/choiseListManagement/choiseListManagement.spec.js @@ -0,0 +1,44 @@ +const helpers = require('../shared/helpers'); +const ChoiseListManagement = require('./choiseListManagement.page'); + +describe.only('Choise List Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/choises_list_management')); + + const Page = new ChoiseListManagement(); + + const newChoiseListElement = { + name : 'oshwe', + label : 'OSHWE', + }; + + const deleteListElement = { + name : 'fruit', + label : 'Fruit', + }; + + const updateChoiseListElement = { + parent : 'Matonge', + group_label : 'Avenue', + }; + + it('successfully creates a new Choise List Management', async () => { + await Page.create(newChoiseListElement); + }); + + it('successfully edits a Choise List Management', async () => { + await Page.edit(newChoiseListElement.label, updateChoiseListElement); + }); + + it('don\'t create when incorrect Choise List Management', async () => { + await Page.errorOnCreate(); + }); + + it('successfully creates a deletable element', async () => { + await Page.create(deleteListElement); + }); + + it('successfully delete a list Element', async () => { + await Page.delete(deleteListElement.label); + }); +}); diff --git a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js index 6d612a9b46..490cbb7d5d 100644 --- a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js +++ b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.page.js @@ -2,13 +2,11 @@ /* eslint */ /** - * This class is represents a payroll configuration page in term of structure and - * behaviour so it is a payroll configuration page object + * This class is represents a Data Collector page in term of structure and + * behaviour so it is a Data Collector Management page object */ /* loading grid actions */ -const GA = require('../shared/GridAction'); -const GU = require('../shared/GridUtils'); const GridRow = require('../shared/GridRow'); const FU = require('../shared/FormUtils'); const components = require('../shared/components'); @@ -21,7 +19,7 @@ class DataCollectorManagementPage { } /** - * simulate the create PayrollConfig button click to show the dialog of creation + * simulate the create Data Collector button click to show the dialog of creation */ async create(dataCollectorManagement) { await FU.buttons.create(); diff --git a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js index 34eb57a41f..144570729d 100644 --- a/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js +++ b/test/end-to-end/dataCollectorManagement/dataCollectorManagement.spec.js @@ -1,7 +1,7 @@ const helpers = require('../shared/helpers'); const DataCollectorManagement = require('./dataCollectorManagement.page'); -describe.only('Data Collector Management', () => { +describe('Data Collector Management', () => { // navigate to the page before(() => helpers.navigate('#!/data_collector_management')); @@ -33,7 +33,7 @@ describe.only('Data Collector Management', () => { await Page.errorOnCreate(); }); - it('successfully delete a Configuration Payroll Period', async () => { + it('successfully delete a Data Collector Management', async () => { await Page.delete(updateDataCollector.label); }); }); diff --git a/test/end-to-end/shared/components/bhChoiseListSelect.js b/test/end-to-end/shared/components/bhChoiseListSelect.js new file mode 100644 index 0000000000..eee5ca5275 --- /dev/null +++ b/test/end-to-end/shared/components/bhChoiseListSelect.js @@ -0,0 +1,17 @@ +/* global element, by */ + +const FU = require('../FormUtils'); + +module.exports = { + selector : '[bh-choise-list-select]', + set : async function set(list, id) { + const locator = (id) ? by.id(id) : by.css(this.selector); + const target = element(locator); + + // hack to make sure previous 'blur' event fires if we are using + // ngModelOptions updateOn 'blur' for every input + await target.click(); + + await FU.uiSelect('$ctrl.list', list, target); + }, +}; diff --git a/test/end-to-end/shared/components/index.js b/test/end-to-end/shared/components/index.js index a1cf22ab2f..d63d862136 100644 --- a/test/end-to-end/shared/components/index.js +++ b/test/end-to-end/shared/components/index.js @@ -71,4 +71,5 @@ module.exports = { diagnosisSelect : require('./bhDiagnosisSelect'), entityGroupSelect : require('./bhEntityGroupSelect'), cronSelect : require('./bhCronSelect'), + choiseListSelect : require('./bhChoiseListSelect'), }; diff --git a/test/integration/choiseListManagement.js b/test/integration/choiseListManagement.js new file mode 100644 index 0000000000..df6b21a4b6 --- /dev/null +++ b/test/integration/choiseListManagement.js @@ -0,0 +1,76 @@ +/* global expect, agent */ +const helpers = require('./helpers'); + +describe('(/choises_list_management) Choise List Management', () => { + const numListElement = 22; + + const newElementList = { + name : 'oshwe', + label : 'OSHWE', + fixed : 0, + parent : 0, + group_label : 0, + is_group : 0, + is_title : 0, + }; + + const updateElementList = { + parent : 20, + group_label : 15, + }; + + it('POST /choises_list_management add Choise List Element', () => { + return agent.post('/choises_list_management') + .send(newElementList) + .then((res) => { + helpers.api.created(res); + newElementList.id = res.body.id; + }) + .catch(helpers.handler); + }); + + it('GET /choises_list_management/:id returns one Choise List Management as detail', () => { + return agent.get(`/choises_list_management/${newElementList.id}`) + .then((res) => { + expect(res).to.have.status(200); + + expect(res).to.be.a('object'); + expect(res.body).to.have.all.keys('id', 'name', 'label', 'fixed', 'parent', + 'group_label', 'is_group', 'is_title'); + }) + .catch(helpers.handler); + }); + + it('PUT /choises_list_management/:id updates the newly added Choise List Management', () => { + return agent.put(`/choises_list_management/${newElementList.id}`) + .send(updateElementList) + .then((res) => { + expect(res).to.have.status(200); + expect(res).to.be.a('object'); + expect(res.body.id).to.equal(newElementList.id); + }) + .catch(helpers.handler); + }); + + it('GET /choises_list_management returns all Choise List Management', () => { + return agent.get(`/choises_list_management/`) + .then((res) => { + helpers.api.listed(res, numListElement); + expect(res.body[0]).to.have.all.keys('id', 'name', 'label', 'fixed', 'parent', + 'group_label', 'is_group', 'is_title'); + }) + .catch(helpers.handler); + }); + + it('DELETE /choises_list_management/:id deletes a Choise List Management', () => { + return agent.delete(`/choises_list_management/${newElementList.id}`) + .then((res) => { + helpers.api.deleted(res); + return agent.get(`/choises_list_management/${newElementList.id}`); + }) + .then((res) => { + helpers.api.errored(res, 404); + }) + .catch(helpers.handler); + }); +}); From 7d3eec255c91ec2c7f2818c3caf9596a676d3836 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Mon, 16 Sep 2019 16:24:35 +0100 Subject: [PATCH 03/30] Resolve conflict s3 --- client/src/i18n/en/form.json | 2 +- client/src/i18n/en/tree.json | 2 +- client/src/i18n/fr/form.json | 2 +- client/src/i18n/fr/tree.json | 2 +- ...iseListSelect.js => bhChoiceListSelect.js} | 16 ++-- .../choices_list_management.html} | 16 ++-- .../choices_list_management.js} | 30 +++---- .../choices_list_management.routes.js | 43 ++++++++++ .../choices_list_management.service.js} | 32 +++---- .../choices_list_management.modals.html} | 56 ++++++------- .../modals/choices_list_management.modals.js | 84 +++++++++++++++++++ .../templates/action.cell.tmpl.html | 0 .../templates/gridLabels.tmpl.html | 2 +- .../templates/gridName.tmpl.html | 0 .../templates/is_title.tmpl.html | 0 .../choises_list_management.routes.js | 43 ---------- .../modals/choises_list_management.modals.js | 84 ------------------- ...tmpl.html => bhChoiceListSelect.tmpl.html} | 10 +-- server/config/routes.js | 12 +-- ...Management.js => choicesListManagement.js} | 44 +++++----- server/models/bhima.sql | 44 +++++----- server/models/schema.sql | 6 +- .../choiceListManagement.page.js} | 22 ++--- .../choiceListManagement.spec.js | 44 ++++++++++ .../choiseListManagement.spec.js | 44 ---------- ...iseListSelect.js => bhChoiceListSelect.js} | 2 +- test/end-to-end/shared/components/index.js | 2 +- ...tManagement.js => choiceListManagement.js} | 24 +++--- 28 files changed, 334 insertions(+), 334 deletions(-) rename client/src/js/components/{bhChoiseListSelect.js => bhChoiceListSelect.js} (79%) rename client/src/modules/{choises_list_management/choises_list_management.html => choices_list_management/choices_list_management.html} (65%) rename client/src/modules/{choises_list_management/choises_list_management.js => choices_list_management/choices_list_management.js} (74%) create mode 100644 client/src/modules/choices_list_management/choices_list_management.routes.js rename client/src/modules/{choises_list_management/choises_list_management.service.js => choices_list_management/choices_list_management.service.js} (66%) rename client/src/modules/{choises_list_management/modals/choises_list_management.modals.html => choices_list_management/modals/choices_list_management.modals.html} (53%) create mode 100644 client/src/modules/choices_list_management/modals/choices_list_management.modals.js rename client/src/modules/{choises_list_management => choices_list_management}/templates/action.cell.tmpl.html (100%) rename client/src/modules/{choises_list_management => choices_list_management}/templates/gridLabels.tmpl.html (88%) rename client/src/modules/{choises_list_management => choices_list_management}/templates/gridName.tmpl.html (100%) rename client/src/modules/{choises_list_management => choices_list_management}/templates/is_title.tmpl.html (100%) delete mode 100644 client/src/modules/choises_list_management/choises_list_management.routes.js delete mode 100644 client/src/modules/choises_list_management/modals/choises_list_management.modals.js rename client/src/modules/templates/{bhChoiseListSelect.tmpl.html => bhChoiceListSelect.tmpl.html} (72%) rename server/controllers/admin/{choisesListManagement.js => choicesListManagement.js} (69%) rename test/end-to-end/{choiseListManagement/choiseListManagement.page.js => choiceListManagement/choiceListManagement.page.js} (69%) create mode 100644 test/end-to-end/choiceListManagement/choiceListManagement.spec.js delete mode 100644 test/end-to-end/choiseListManagement/choiseListManagement.spec.js rename test/end-to-end/shared/components/{bhChoiseListSelect.js => bhChoiceListSelect.js} (91%) rename test/integration/{choiseListManagement.js => choiceListManagement.js} (67%) diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index 3c3f49e80f..40fddb4f54 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -314,7 +314,7 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Prepayment Amount", "CHARGE": "Cost", - "CHOISE_LIST": "Choise list", + "CHOICE_LIST": "Choice list", "CLIENT": "Client", "CLIENT_ID": "Client ID", "CLIENT_TO_IGNORE": "Client(s) to ignore", diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index af96c386c0..0f20938537 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -23,7 +23,7 @@ "CASHFLOW_BY_SERVICE" : "Cashflow by Service", "CASH_PAYMENT_REGISTRY" : "Cash Payment Registry", "CASH_WINDOW" : "Cash Window", - "CHOISES_LIST_MANAGEMENT" : "Choises List Management", + "CHOICES_LIST_MANAGEMENT" : "Choices List Management", "COMPLEX_JOURNAL_VOUCHER" : "Journal Vouchers", "COST_CENTER_MGMT" : "Cost Center Management", "CREDIT_NOTE" : "Credit Note", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 92be20c2e3..cf75210fee 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -317,7 +317,7 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Total de la Caution", "CHARGE": "Charge", - "CHOISE_LIST": "Liste de choix", + "CHOICE_LIST": "Liste de choix", "CLIENT": "Client", "CLIENT_ID": "Identifiant client", "CLIENT_TO_IGNORE": "Client(s) à ignorer", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index c186a0487b..ac36fd9228 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -23,7 +23,7 @@ "CASHFLOW_BY_SERVICE": "Journal de Ventilation", "CASH_PAYMENT_REGISTRY":"Registre des paiements", "CASH_WINDOW":"Paiements", - "CHOISES_LIST_MANAGEMENT" : "Gestion des listes de choix", + "CHOICES_LIST_MANAGEMENT" : "Gestion des listes de choix", "COMPLEX_JOURNAL_VOUCHER":"Ajout de transactions", "COST_CENTER_MGMT":"Centres de coûts", "CREDIT_NOTE":"Note de Crédit", diff --git a/client/src/js/components/bhChoiseListSelect.js b/client/src/js/components/bhChoiceListSelect.js similarity index 79% rename from client/src/js/components/bhChoiseListSelect.js rename to client/src/js/components/bhChoiceListSelect.js index d3bd6edbe3..4a811d4845 100644 --- a/client/src/js/components/bhChoiseListSelect.js +++ b/client/src/js/components/bhChoiceListSelect.js @@ -1,7 +1,7 @@ angular.module('bhima.components') - .component('bhChoiseListSelect', { - templateUrl : 'modules/templates/bhChoiseListSelect.tmpl.html', - controller : ChoiseListController, + .component('bhChoiceListSelect', { + templateUrl : 'modules/templates/bhChoiceListSelect.tmpl.html', + controller : ChoiceListController, transclude : true, bindings : { onSelectCallback : '&', @@ -16,12 +16,12 @@ angular.module('bhima.components') }, }); -ChoiseListController.$inject = ['ChoisesListManagementService', 'NotifyService']; +ChoiceListController.$inject = ['ChoicesListManagementService', 'NotifyService']; /** - * Choise List + * Choice List */ -function ChoiseListController(ChoisesList, Notify) { +function ChoiceListController(ChoicesList, Notify) { const $ctrl = this; $ctrl.$onInit = function onInit() { @@ -33,7 +33,7 @@ function ChoiseListController(ChoisesList, Notify) { group_label : $ctrl.groupLabel || null, }; - ChoisesList.read(null, query) + ChoicesList.read(null, query) .then(lists => { $ctrl.lists = lists; }) @@ -51,7 +51,7 @@ function ChoiseListController(ChoisesList, Notify) { group_label : $ctrl.groupLabel || null, }; - ChoisesList.read(null, query) + ChoicesList.read(null, query) .then(lists => { $ctrl.lists = lists; }) diff --git a/client/src/modules/choises_list_management/choises_list_management.html b/client/src/modules/choices_list_management/choices_list_management.html similarity index 65% rename from client/src/modules/choises_list_management/choises_list_management.html rename to client/src/modules/choices_list_management/choices_list_management.html index d68af8a343..ca15e7a362 100644 --- a/client/src/modules/choises_list_management/choises_list_management.html +++ b/client/src/modules/choices_list_management/choices_list_management.html @@ -2,20 +2,20 @@
  1. TREE.ADMIN
    2. -
  2. TREE.CHOISES_LIST_MANAGEMENT
    3. +
  3. TREE.CHOICES_LIST_MANAGEMENT
-
-
@@ -26,12 +26,12 @@
-
- +
diff --git a/client/src/modules/choises_list_management/choises_list_management.js b/client/src/modules/choices_list_management/choices_list_management.js similarity index 74% rename from client/src/modules/choises_list_management/choises_list_management.js rename to client/src/modules/choices_list_management/choices_list_management.js index ce5e17a36a..b6739155e6 100644 --- a/client/src/modules/choises_list_management/choises_list_management.js +++ b/client/src/modules/choices_list_management/choices_list_management.js @@ -1,16 +1,16 @@ angular.module('bhima.controllers') - .controller('ChoisesListManagementController', ChoisesListManagementController); + .controller('ChoicesListManagementController', ChoicesListManagementController); -ChoisesListManagementController.$inject = [ - '$state', 'ChoisesListManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', +ChoicesListManagementController.$inject = [ + '$state', 'ChoicesListManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', ]; /** - * CHOISES LIST MANAGEMENT Controller - * This module is responsible for handling the CRUD operation on CHOISES LIST MANAGEMENT + * CHOICES LIST MANAGEMENT Controller + * This module is responsible for handling the CRUD operation on CHOICES LIST MANAGEMENT */ -function ChoisesListManagementController($state, ChoisesListManagement, Notify, uiGridConstants, ModalService) { +function ChoicesListManagementController($state, ChoicesListManagement, Notify, uiGridConstants, ModalService) { const vm = this; vm.gridApi = {}; vm.filterEnabled = false; @@ -31,27 +31,27 @@ function ChoisesListManagementController($state, ChoisesListManagement, Notify, displayName : 'FORM.LABELS.VARIABLE_NAME', enableFiltering : 'true', headerCellFilter : 'translate', - cellTemplate : '/modules/choises_list_management/templates/gridName.tmpl.html', + cellTemplate : '/modules/choices_list_management/templates/gridName.tmpl.html', }, { field : 'label', displayName : 'FORM.LABELS.DESIGNATION', enableFiltering : 'true', headerCellFilter : 'translate', - cellTemplate : '/modules/choises_list_management/templates/gridLabels.tmpl.html', + cellTemplate : '/modules/choices_list_management/templates/gridLabels.tmpl.html', }, { field : 'is_title', displayName : 'FORM.LABELS.TITLE', enableFiltering : 'true', headerCellFilter : 'translate', - cellTemplate : '/modules/choises_list_management/templates/is_title.tmpl.html', + cellTemplate : '/modules/choices_list_management/templates/is_title.tmpl.html', }, { field : 'action', displayName : '', enableFiltering : 'false', - cellTemplate : '/modules/choises_list_management/templates/action.cell.tmpl.html', + cellTemplate : '/modules/choices_list_management/templates/action.cell.tmpl.html', }, ], }; @@ -71,14 +71,14 @@ function ChoisesListManagementController($state, ChoisesListManagement, Notify, vm.edit = edit; vm.remove = remove; - function edit(choisesListManagement) { - $state.go('choises_list_management.edit', { id : choisesListManagement.id }); + function edit(choicesListManagement) { + $state.go('choices_list_management.edit', { id : choicesListManagement.id }); } function remove(id) { ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') .then(() => { - ChoisesListManagement.delete(id) + ChoicesListManagement.delete(id) .then(() => { Notify.success('FORM.INFO.DELETE_SUCCESS'); loadGrid(); @@ -96,9 +96,9 @@ function ChoisesListManagementController($state, ChoisesListManagement, Notify, vm.hasError = false; vm.loading = true; - ChoisesListManagement.read() + ChoicesListManagement.read() .then((data) => { - const dataTree = ChoisesListManagement.formatStore(data); + const dataTree = ChoicesListManagement.formatStore(data); vm.gridOptions.data = dataTree; }) .catch(handleError) diff --git a/client/src/modules/choices_list_management/choices_list_management.routes.js b/client/src/modules/choices_list_management/choices_list_management.routes.js new file mode 100644 index 0000000000..8fb0daf5a7 --- /dev/null +++ b/client/src/modules/choices_list_management/choices_list_management.routes.js @@ -0,0 +1,43 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('choices_list_management', { + url : '/choices_list_management', + controller : 'ChoicesListManagementController as ChoicesListManagementCtrl', + templateUrl : 'modules/choices_list_management/choices_list_management.html', + }) + + .state('choices_list_management.create', { + url : '/create', + params : { + choices_list_management : { value : null }, + creating : { value : true }, + parentId : { value : null }, + }, + onEnter : ['$uibModal', choicesListManagementModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('choices_list_management.edit', { + url : '/:id/edit', + params : { + choices_list_management : { value : null }, + creating : { value : false }, + }, + onEnter : ['$uibModal', choicesListManagementModal], + onExit : ['$uibModalStack', closeModal], + }); + }]); + +function choicesListManagementModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/choices_list_management/modals/choices_list_management.modals.html', + controller : 'ChoicesListManagementModalController as ChoicesListManagementModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/choises_list_management/choises_list_management.service.js b/client/src/modules/choices_list_management/choices_list_management.service.js similarity index 66% rename from client/src/modules/choises_list_management/choises_list_management.service.js rename to client/src/modules/choices_list_management/choices_list_management.service.js index 831eb98642..6077b8dc89 100644 --- a/client/src/modules/choises_list_management/choises_list_management.service.js +++ b/client/src/modules/choices_list_management/choices_list_management.service.js @@ -1,17 +1,17 @@ angular.module('bhima.services') - .service('ChoisesListManagementService', ChoisesListManagementService); + .service('ChoicesListManagementService', ChoicesListManagementService); -ChoisesListManagementService.$inject = ['PrototypeApiService']; +ChoicesListManagementService.$inject = ['PrototypeApiService']; /** - * @class ChoisesListManagementService + * @class ChoicesListManagementService * @extends PrototypeApiService * * @description - * Encapsulates common requests to the /choises_list_management/ URL. + * Encapsulates common requests to the /choices_list_management/ URL. */ -function ChoisesListManagementService(Api) { - const service = new Api('/choises_list_management/'); +function ChoicesListManagementService(Api) { + const service = new Api('/choices_list_management/'); service.formatStore = formatStore; @@ -24,18 +24,18 @@ function ChoisesListManagementService(Api) { * @method order * * @description - * Creates a proper choise list ordering by first creating an choise list tree and + * Creates a proper choice list ordering by first creating an choice list tree and * then flattening in place. * - * @param {Array} lists - a list of choises lists objects - * @returns {Array} - the properly ordered list of choises lists objects + * @param {Array} lists - a list of choices lists objects + * @returns {Array} - the properly ordered list of choices lists objects */ function order(data) { // NOTE: we assume the root node is 0 const ROOT_NODE = 0; - // build the choises list tree + // build the choices list tree const tree = getChildren(data, ROOT_NODE); // return a flattened tree (in order) @@ -46,13 +46,13 @@ function ChoisesListManagementService(Api) { * @method getChildren * * @description - * This method builds a tree data structure of Choises lists and children of a + * This method builds a tree data structure of Choices lists and children of a * specified parentId. * * @returns {Array} - an array of children */ function getChildren(data, parentId) { - // base case: There are no child Choises list + // base case: There are no child Choices list if (data.length === 0) { return null; } // returns all List where the parent is the @@ -63,12 +63,12 @@ function ChoisesListManagementService(Api) { // and attach them as childen of their parent account children.forEach(handleChildren); - function handleParent(choiseList) { - return choiseList.parent === parentId; + function handleParent(choiceList) { + return choiceList.parent === parentId; } - function handleChildren(choiseList) { - choiseList.children = getChildren(data, choiseList.id); + function handleChildren(choiceList) { + choiceList.children = getChildren(data, choiceList.id); } return children; diff --git a/client/src/modules/choises_list_management/modals/choises_list_management.modals.html b/client/src/modules/choices_list_management/modals/choices_list_management.modals.html similarity index 53% rename from client/src/modules/choises_list_management/modals/choises_list_management.modals.html rename to client/src/modules/choices_list_management/modals/choices_list_management.modals.html index b9905fddc9..c82653f328 100644 --- a/client/src/modules/choises_list_management/modals/choises_list_management.modals.html +++ b/client/src/modules/choices_list_management/modals/choices_list_management.modals.html @@ -1,15 +1,15 @@ -
  1. TREE.ADMIN
    2. -
  2. - TREE.CHOISES_LIST_MANAGEMENT +
  3. + TREE.CHOICES_LIST_MANAGEMENT
    4. -
  4. - TREE.CHOISES_LIST_MANAGEMENT +
  5. + TREE.CHOICES_LIST_MANAGEMENT
@@ -18,47 +18,47 @@
+ ng-class="{ 'has-error' : ChoicesListManagementForm.$submitted && ChoicesListManagementForm.description.$invalid }">
- -
+
+ ng-class="{ 'has-error' : ChoicesListManagementForm.$submitted && ChoicesListManagementForm.description.$invalid }">
- -
+
- - - + + + - - - + on-select-callback="ChoicesListManagementModalCtrl.onSelectGroup(list)"> + +
diff --git a/client/src/modules/choises_list_management/templates/gridName.tmpl.html b/client/src/modules/choices_list_management/templates/gridName.tmpl.html similarity index 100% rename from client/src/modules/choises_list_management/templates/gridName.tmpl.html rename to client/src/modules/choices_list_management/templates/gridName.tmpl.html diff --git a/client/src/modules/choises_list_management/templates/is_title.tmpl.html b/client/src/modules/choices_list_management/templates/is_title.tmpl.html similarity index 100% rename from client/src/modules/choises_list_management/templates/is_title.tmpl.html rename to client/src/modules/choices_list_management/templates/is_title.tmpl.html diff --git a/client/src/modules/choises_list_management/choises_list_management.routes.js b/client/src/modules/choises_list_management/choises_list_management.routes.js deleted file mode 100644 index 66b75993d6..0000000000 --- a/client/src/modules/choises_list_management/choises_list_management.routes.js +++ /dev/null @@ -1,43 +0,0 @@ -angular.module('bhima.routes') - .config(['$stateProvider', $stateProvider => { - $stateProvider - .state('choises_list_management', { - url : '/choises_list_management', - controller : 'ChoisesListManagementController as ChoisesListManagementCtrl', - templateUrl : 'modules/choises_list_management/choises_list_management.html', - }) - - .state('choises_list_management.create', { - url : '/create', - params : { - choises_list_management : { value : null }, - creating : { value : true }, - parentId : { value : null }, - }, - onEnter : ['$uibModal', choisesListManagementModal], - onExit : ['$uibModalStack', closeModal], - }) - - .state('choises_list_management.edit', { - url : '/:id/edit', - params : { - choises_list_management : { value : null }, - creating : { value : false }, - }, - onEnter : ['$uibModal', choisesListManagementModal], - onExit : ['$uibModalStack', closeModal], - }); - }]); - -function choisesListManagementModal($modal) { - $modal.open({ - keyboard : false, - backdrop : 'static', - templateUrl : 'modules/choises_list_management/modals/choises_list_management.modals.html', - controller : 'ChoisesListManagementModalController as ChoisesListManagementModalCtrl', - }); -} - -function closeModal(ModalStack) { - ModalStack.dismissAll(); -} diff --git a/client/src/modules/choises_list_management/modals/choises_list_management.modals.js b/client/src/modules/choises_list_management/modals/choises_list_management.modals.js deleted file mode 100644 index dfa7922343..0000000000 --- a/client/src/modules/choises_list_management/modals/choises_list_management.modals.js +++ /dev/null @@ -1,84 +0,0 @@ -angular.module('bhima.controllers') - .controller('ChoisesListManagementModalController', ChoisesListManagementModalController); - -ChoisesListManagementModalController.$inject = [ - '$state', 'ChoisesListManagementService', 'NotifyService', 'appcache', -]; - -/** - * CHOISES LIST MANAGEMENT Modal Controller - */ - -function ChoisesListManagementModalController($state, ChoisesListManagement, Notify, AppCache) { - const vm = this; - const cache = AppCache('ChoisesListManagementModal'); - - vm.choise = {}; - vm.stateParams = {}; - - // exposed methods - vm.submit = submit; - vm.closeModal = closeModal; - vm.clear = clear; - vm.onSelectParent = onSelectParent; - vm.onSelectGroup = onSelectGroup; - - if ($state.params.creating || $state.params.id) { - cache.stateParams = $state.params; - vm.stateParams = cache.stateParams; - vm.choise.parent = $state.params.parentId; - } else { - vm.stateParams = cache.stateParams; - } - vm.isCreating = vm.stateParams.creating; - - if (!vm.isCreating) { - ChoisesListManagement.read(vm.stateParams.id) - .then(data => { - vm.choise = data; - }) - .catch(Notify.handleError); - } - - // load CHOISES LIST MANAGEMENT - ChoisesListManagement.read() - .then(choisesList => { - vm.choisesList = choisesList; - }) - .catch(Notify.handleError); - - // submit the data to the server from all two forms (update, create) - function submit(choisesListManagementForm) { - vm.hasNoChange = choisesListManagementForm.$submitted && choisesListManagementForm.$pristine && !vm.isCreating; - if (choisesListManagementForm.$invalid) { return null; } - if (!choisesListManagementForm.$dirty) { return null; } - - const promise = (vm.isCreating) - ? ChoisesListManagement.create(vm.choise) - : ChoisesListManagement.update(vm.choise.id, vm.choise); - - return promise - .then(() => { - const translateKey = (vm.isCreating) ? 'FORM.INFO.CREATE_SUCCESS' : 'FORM.INFO.UPDATE_SUCCESS'; - Notify.success(translateKey); - $state.go('choises_list_management', null, { reload : true }); - }) - .catch(Notify.handleError); - } - - function onSelectParent(parent) { - vm.choise.parent = parent.id; - } - - function onSelectGroup(group) { - vm.choise.group_label = group.id; - } - - function clear(value) { - vm.choise[value] = 0; - } - - function closeModal() { - $state.transitionTo('choises_list_management'); - } -} diff --git a/client/src/modules/templates/bhChoiseListSelect.tmpl.html b/client/src/modules/templates/bhChoiceListSelect.tmpl.html similarity index 72% rename from client/src/modules/templates/bhChoiseListSelect.tmpl.html rename to client/src/modules/templates/bhChoiceListSelect.tmpl.html index 3f0a3f3b98..99d3e8dc39 100644 --- a/client/src/modules/templates/bhChoiseListSelect.tmpl.html +++ b/client/src/modules/templates/bhChoiceListSelect.tmpl.html @@ -1,20 +1,20 @@ -
+
+ ng-class="{ 'has-error' : ChoiceListForm.$submitted && ChoiceListForm.list.$invalid }"> - + {{ $select.selected.label }} -
+
diff --git a/server/config/routes.js b/server/config/routes.js index 09b031c255..2a824dc369 100644 --- a/server/config/routes.js +++ b/server/config/routes.js @@ -145,7 +145,7 @@ const indicatorRerpor = require('../controllers/finance/indicator/dashboard/repo // Data Kit const dataCollectorManagement = require('../controllers/admin/dataCollectorManagement'); -const choisesListManagement = require('../controllers/admin/choisesListManagement'); +const choicesListManagement = require('../controllers/admin/choicesListManagement'); // expose routes to the server. exports.configure = function configure(app) { @@ -989,11 +989,11 @@ exports.configure = function configure(app) { app.delete('/data_collector_management/:id', dataCollectorManagement.delete); // API for CHOISES LIST MANAGEMENT routes crud - app.get('/choises_list_management', choisesListManagement.list); - app.get('/choises_list_management/:id', choisesListManagement.detail); - app.post('/choises_list_management', choisesListManagement.create); - app.put('/choises_list_management/:id', choisesListManagement.update); - app.delete('/choises_list_management/:id', choisesListManagement.delete); + app.get('/choices_list_management', choicesListManagement.list); + app.get('/choices_list_management/:id', choicesListManagement.detail); + app.post('/choices_list_management', choicesListManagement.create); + app.put('/choices_list_management/:id', choicesListManagement.update); + app.delete('/choices_list_management/:id', choicesListManagement.delete); }; diff --git a/server/controllers/admin/choisesListManagement.js b/server/controllers/admin/choicesListManagement.js similarity index 69% rename from server/controllers/admin/choisesListManagement.js rename to server/controllers/admin/choicesListManagement.js index 03afcbba0d..587275b92d 100644 --- a/server/controllers/admin/choisesListManagement.js +++ b/server/controllers/admin/choicesListManagement.js @@ -1,19 +1,19 @@ /** -* CHOISES LIST MANAGEMENT Controller +* CHOICES LIST MANAGEMENT Controller * -* This controller exposes an API to the client for reading and writing CHOISES LIST MANAGEMENT +* This controller exposes an API to the client for reading and writing CHOICES LIST MANAGEMENT */ const db = require('../../lib/db'); const NotFound = require('../../lib/errors/NotFound'); const FilterParser = require('../../lib/filter'); -// GET /choises_list_management -function lookupChoisesListManagement(id) { +// GET /choices_list_management +function lookupchoicesListManagement(id) { const sql = ` SELECT id, name, label, fixed, group_label, parent, is_title, is_group - FROM choises_list_management - WHERE choises_list_management.id = ?`; + FROM choices_list_management + WHERE choices_list_management.id = ?`; return db.one(sql, [id]); } @@ -23,7 +23,7 @@ function list(req, res, next) { const sql = ` SELECT id, name, label, fixed, group_label, parent, is_title, is_group - FROM choises_list_management + FROM choices_list_management `; filters.equals('is_title'); @@ -44,14 +44,14 @@ function list(req, res, next) { } /** -* GET /choises_list_management/:ID +* GET /choices_list_management/:ID * -* Returns the detail of a single choises_list_management +* Returns the detail of a single choices_list_management */ function detail(req, res, next) { const { id } = req.params; - lookupChoisesListManagement(id) + lookupchoicesListManagement(id) .then((record) => { res.status(200).json(record); }) @@ -60,9 +60,9 @@ function detail(req, res, next) { } -// POST /choises_list_management +// POST /choices_list_management function create(req, res, next) { - const sql = `INSERT INTO choises_list_management SET ?`; + const sql = `INSERT INTO choices_list_management SET ?`; const data = req.body; // Set 0 (root) like default parent data.parent = data.parent || 0; @@ -76,13 +76,13 @@ function create(req, res, next) { } -// PUT /choises_list_management /:id +// PUT /choices_list_management /:id function update(req, res, next) { - const sql = `UPDATE choises_list_management SET ? WHERE id = ?;`; + const sql = `UPDATE choices_list_management SET ? WHERE id = ?;`; db.exec(sql, [req.body, req.params.id]) .then(() => { - return lookupChoisesListManagement(req.params.id); + return lookupchoicesListManagement(req.params.id); }) .then((record) => { // all updates completed successfull, return full object to client @@ -92,9 +92,9 @@ function update(req, res, next) { .done(); } -// DELETE /choises_list_management/:id +// DELETE /choices_list_management/:id function remove(req, res, next) { - const sql = `DELETE FROM choises_list_management WHERE id = ?;`; + const sql = `DELETE FROM choices_list_management WHERE id = ?;`; db.exec(sql, [req.params.id]) .then((row) => { @@ -109,17 +109,17 @@ function remove(req, res, next) { .done(); } -// get list of choisesListManagement +// get list of choicesListManagement exports.list = list; -// get details of a choisesListManagement +// get details of a choicesListManagement exports.detail = detail; -// create a new choisesListManagement +// create a new choicesListManagement exports.create = create; -// update choisesListManagement informations +// update choicesListManagement informations exports.update = update; -// Delete a choisesListManagement +// Delete a choicesListManagement exports.delete = remove; diff --git a/server/models/bhima.sql b/server/models/bhima.sql index ef0b8f5662..afe3e5c596 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -374,26 +374,26 @@ INSERT INTO `cron` (`label`, `value`) VALUES INSERT INTO `data_collector_management` (`label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES ('Fiche Kardex', 'Fiche de consommation Medicament', '1.0', '#E0FFFF', 1); --- choises_list_management -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (2, 'm', 'Masculin', 0, 1, 1, 0, 0); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (3, 'f', 'Féminin', 0, 1, 1, 0, 0); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (4, 'pays', 'Pays', 0, 0, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (5, 'province', 'Province', 0, 4, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (6, 'districte', 'Districte', 0, 5, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (7, 'ville', 'Ville', 0, 6, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (8, 'commune', 'Commune', 0, 7, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (9, 'quartier', 'Quartier', 0, 8, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (10, 'rdc', 'RD Congo', 0, 0, 4, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (11, 'kin', 'Kinshasa', 0, 10, 4, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (12, 'mont_amba', 'Mont Amba', 0, 11, 6, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (13, 'lemba', 'Lemba', 0, 12, 8, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (14, 'salongo', 'Salongo', 0, 13, 9, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (15, 'avenue', 'Avenue', 0, 9, 0, 1, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (16, 'bypass', 'By Pass', 0, 14, 15, 0, 0); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (17, 'kalala', 'Kalala', 0, 14, 0, 0, 0); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (18, 'funa', 'Funa', 0, 11, 6, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); -INSERT INTO `choises_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); +-- choices_list_management +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (2, 'm', 'Masculin', 0, 1, 1, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (3, 'f', 'Féminin', 0, 1, 1, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (4, 'pays', 'Pays', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (5, 'province', 'Province', 0, 4, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (6, 'districte', 'Districte', 0, 5, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (7, 'ville', 'Ville', 0, 6, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (8, 'commune', 'Commune', 0, 7, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (9, 'quartier', 'Quartier', 0, 8, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (10, 'rdc', 'RD Congo', 0, 0, 4, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (11, 'kin', 'Kinshasa', 0, 10, 4, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (12, 'mont_amba', 'Mont Amba', 0, 11, 6, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (13, 'lemba', 'Lemba', 0, 12, 8, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (14, 'salongo', 'Salongo', 0, 13, 9, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (15, 'avenue', 'Avenue', 0, 9, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (16, 'bypass', 'By Pass', 0, 14, 15, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (17, 'kalala', 'Kalala', 0, 14, 0, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (18, 'funa', 'Funa', 0, 11, 6, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); diff --git a/server/models/schema.sql b/server/models/schema.sql index 06f6c21301..0ef5457dec 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2370,8 +2370,8 @@ CREATE TABLE `data_collector_management` ( UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `choises_list_management`; -CREATE TABLE `choises_list_management` ( +DROP TABLE IF EXISTS `choices_list_management`; +CREATE TABLE `choices_list_management` ( `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, `name` VARCHAR(100) NOT NULL, `label` VARCHAR(100) NOT NULL, @@ -2381,7 +2381,7 @@ CREATE TABLE `choises_list_management` ( `is_group` tinyint(1) NOT NULL DEFAULT 0, `is_title` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), - UNIQUE KEY `choises_list_management_1` (`label`, `name`, `parent`) + UNIQUE KEY `choices_list_management_1` (`label`, `name`, `parent`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; SET foreign_key_checks = 1; diff --git a/test/end-to-end/choiseListManagement/choiseListManagement.page.js b/test/end-to-end/choiceListManagement/choiceListManagement.page.js similarity index 69% rename from test/end-to-end/choiseListManagement/choiseListManagement.page.js rename to test/end-to-end/choiceListManagement/choiceListManagement.page.js index 97d7323f37..5b29aab1aa 100644 --- a/test/end-to-end/choiseListManagement/choiseListManagement.page.js +++ b/test/end-to-end/choiceListManagement/choiceListManagement.page.js @@ -2,8 +2,8 @@ /* eslint */ /** - * This class is represents a Choise List Management page in term of structure and - * behaviour so it is a Choise List Management page object + * This class is represents a Choice List Management page in term of structure and + * behaviour so it is a Choice List Management page object */ /* loading grid actions */ @@ -11,9 +11,9 @@ const GridRow = require('../shared/GridRow'); const FU = require('../shared/FormUtils'); const components = require('../shared/components'); -class ChoiseListManagementPage { +class ChoiceListManagementPage { constructor() { - this.gridId = 'choises-list-management-grid'; + this.gridId = 'choices-list-management-grid'; this.rubricGrid = element(by.id(this.gridId)); this.actionLinkColumn = 5; } @@ -21,10 +21,10 @@ class ChoiseListManagementPage { /** * simulate the create PayrollConfig button click to show the dialog of creation */ - async create(ChoiseListElement) { + async create(ChoiceListElement) { await FU.buttons.create(); - await FU.input('ChoisesListManagementModalCtrl.choise.label', ChoiseListElement.label); - await FU.input('ChoisesListManagementModalCtrl.choise.name', ChoiseListElement.name); + await FU.input('ChoicesListManagementModalCtrl.choice.label', ChoiceListElement.label); + await FU.input('ChoicesListManagementModalCtrl.choice.name', ChoiceListElement.name); await element(by.id('is_title')).click(); await element(by.id('is_group')).click(); @@ -39,7 +39,7 @@ class ChoiseListManagementPage { async errorOnCreate() { await FU.buttons.create(); await FU.buttons.submit(); - await FU.validation.error('ChoisesListManagementModalCtrl.choise.label'); + await FU.validation.error('ChoicesListManagementModalCtrl.choice.label'); await FU.buttons.cancel(); } @@ -51,8 +51,8 @@ class ChoiseListManagementPage { row.dropdown().click(); row.edit().click(); - await components.choiseListSelect.set(updateDataCollector.parent, 'parent'); - await components.choiseListSelect.set(updateDataCollector.group_label, 'group_label'); + await components.choiceListSelect.set(updateDataCollector.parent, 'parent'); + await components.choiceListSelect.set(updateDataCollector.group_label, 'group_label'); await element(by.id('is_title')).click(); await element(by.id('is_group')).click(); @@ -74,4 +74,4 @@ class ChoiseListManagementPage { } } -module.exports = ChoiseListManagementPage; +module.exports = ChoiceListManagementPage; diff --git a/test/end-to-end/choiceListManagement/choiceListManagement.spec.js b/test/end-to-end/choiceListManagement/choiceListManagement.spec.js new file mode 100644 index 0000000000..1692cc8e67 --- /dev/null +++ b/test/end-to-end/choiceListManagement/choiceListManagement.spec.js @@ -0,0 +1,44 @@ +const helpers = require('../shared/helpers'); +const ChoiceListManagement = require('./choiceListManagement.page'); + +describe('Choice List Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/choices_list_management')); + + const Page = new ChoiceListManagement(); + + const newChoiceListElement = { + name : 'oshwe', + label : 'OSHWE', + }; + + const deleteListElement = { + name : 'fruit', + label : 'Fruit', + }; + + const updateChoiceListElement = { + parent : 'Matonge', + group_label : 'Avenue', + }; + + it('successfully creates a new Choice List Management', async () => { + await Page.create(newChoiceListElement); + }); + + it('successfully edits a Choice List Management', async () => { + await Page.edit(newChoiceListElement.label, updateChoiceListElement); + }); + + it('don\'t create when incorrect Choice List Management', async () => { + await Page.errorOnCreate(); + }); + + it('successfully creates a deletable element', async () => { + await Page.create(deleteListElement); + }); + + it('successfully delete a list Element', async () => { + await Page.delete(deleteListElement.label); + }); +}); diff --git a/test/end-to-end/choiseListManagement/choiseListManagement.spec.js b/test/end-to-end/choiseListManagement/choiseListManagement.spec.js deleted file mode 100644 index 5d14267002..0000000000 --- a/test/end-to-end/choiseListManagement/choiseListManagement.spec.js +++ /dev/null @@ -1,44 +0,0 @@ -const helpers = require('../shared/helpers'); -const ChoiseListManagement = require('./choiseListManagement.page'); - -describe.only('Choise List Management', () => { - // navigate to the page - before(() => helpers.navigate('#!/choises_list_management')); - - const Page = new ChoiseListManagement(); - - const newChoiseListElement = { - name : 'oshwe', - label : 'OSHWE', - }; - - const deleteListElement = { - name : 'fruit', - label : 'Fruit', - }; - - const updateChoiseListElement = { - parent : 'Matonge', - group_label : 'Avenue', - }; - - it('successfully creates a new Choise List Management', async () => { - await Page.create(newChoiseListElement); - }); - - it('successfully edits a Choise List Management', async () => { - await Page.edit(newChoiseListElement.label, updateChoiseListElement); - }); - - it('don\'t create when incorrect Choise List Management', async () => { - await Page.errorOnCreate(); - }); - - it('successfully creates a deletable element', async () => { - await Page.create(deleteListElement); - }); - - it('successfully delete a list Element', async () => { - await Page.delete(deleteListElement.label); - }); -}); diff --git a/test/end-to-end/shared/components/bhChoiseListSelect.js b/test/end-to-end/shared/components/bhChoiceListSelect.js similarity index 91% rename from test/end-to-end/shared/components/bhChoiseListSelect.js rename to test/end-to-end/shared/components/bhChoiceListSelect.js index eee5ca5275..e0b56b1248 100644 --- a/test/end-to-end/shared/components/bhChoiseListSelect.js +++ b/test/end-to-end/shared/components/bhChoiceListSelect.js @@ -3,7 +3,7 @@ const FU = require('../FormUtils'); module.exports = { - selector : '[bh-choise-list-select]', + selector : '[bh-choice-list-select]', set : async function set(list, id) { const locator = (id) ? by.id(id) : by.css(this.selector); const target = element(locator); diff --git a/test/end-to-end/shared/components/index.js b/test/end-to-end/shared/components/index.js index d63d862136..153980d894 100644 --- a/test/end-to-end/shared/components/index.js +++ b/test/end-to-end/shared/components/index.js @@ -71,5 +71,5 @@ module.exports = { diagnosisSelect : require('./bhDiagnosisSelect'), entityGroupSelect : require('./bhEntityGroupSelect'), cronSelect : require('./bhCronSelect'), - choiseListSelect : require('./bhChoiseListSelect'), + choiceListSelect : require('./bhChoiceListSelect'), }; diff --git a/test/integration/choiseListManagement.js b/test/integration/choiceListManagement.js similarity index 67% rename from test/integration/choiseListManagement.js rename to test/integration/choiceListManagement.js index df6b21a4b6..34a52f689f 100644 --- a/test/integration/choiseListManagement.js +++ b/test/integration/choiceListManagement.js @@ -1,7 +1,7 @@ /* global expect, agent */ const helpers = require('./helpers'); -describe('(/choises_list_management) Choise List Management', () => { +describe('(/choices_list_management) Choice List Management', () => { const numListElement = 22; const newElementList = { @@ -19,8 +19,8 @@ describe('(/choises_list_management) Choise List Management', () => { group_label : 15, }; - it('POST /choises_list_management add Choise List Element', () => { - return agent.post('/choises_list_management') + it('POST /choises_list_management add Choice List Element', () => { + return agent.post('/choices_list_management') .send(newElementList) .then((res) => { helpers.api.created(res); @@ -29,8 +29,8 @@ describe('(/choises_list_management) Choise List Management', () => { .catch(helpers.handler); }); - it('GET /choises_list_management/:id returns one Choise List Management as detail', () => { - return agent.get(`/choises_list_management/${newElementList.id}`) + it('GET /choices_list_management/:id returns one Choice List Management as detail', () => { + return agent.get(`/choices_list_management/${newElementList.id}`) .then((res) => { expect(res).to.have.status(200); @@ -41,8 +41,8 @@ describe('(/choises_list_management) Choise List Management', () => { .catch(helpers.handler); }); - it('PUT /choises_list_management/:id updates the newly added Choise List Management', () => { - return agent.put(`/choises_list_management/${newElementList.id}`) + it('PUT /choices_list_management/:id updates the newly added Choice List Management', () => { + return agent.put(`/choices_list_management/${newElementList.id}`) .send(updateElementList) .then((res) => { expect(res).to.have.status(200); @@ -52,8 +52,8 @@ describe('(/choises_list_management) Choise List Management', () => { .catch(helpers.handler); }); - it('GET /choises_list_management returns all Choise List Management', () => { - return agent.get(`/choises_list_management/`) + it('GET /choices_list_management returns all Choice List Management', () => { + return agent.get(`/choices_list_management/`) .then((res) => { helpers.api.listed(res, numListElement); expect(res.body[0]).to.have.all.keys('id', 'name', 'label', 'fixed', 'parent', @@ -62,11 +62,11 @@ describe('(/choises_list_management) Choise List Management', () => { .catch(helpers.handler); }); - it('DELETE /choises_list_management/:id deletes a Choise List Management', () => { - return agent.delete(`/choises_list_management/${newElementList.id}`) + it('DELETE /choices_list_management/:id deletes a Choice List Management', () => { + return agent.delete(`/choices_list_management/${newElementList.id}`) .then((res) => { helpers.api.deleted(res); - return agent.get(`/choises_list_management/${newElementList.id}`); + return agent.get(`/choices_list_management/${newElementList.id}`); }) .then((res) => { helpers.api.errored(res, 404); From b31856dbc2129cf65de0e8f5ff76a6056e6b0925 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:14:41 +0100 Subject: [PATCH 04/30] Rebase with branch master --- client/src/i18n/en/form.json | 17 +- client/src/i18n/fr/form.json | 17 +- client/src/js/components/bhDataCollector.js | 48 +++++ .../js/components/bhSurveyFormTypeSelect.js | 51 ++++++ .../src/js/components/bhSurveyListSelect.js | 36 ++++ .../modals/survey_form.modals.html | 173 ++++++++++++++++++ .../survey_form/modals/survey_form.modals.js | 104 +++++++++++ .../src/modules/survey_form/survey_form.html | 52 ++++++ client/src/modules/survey_form/survey_form.js | 164 +++++++++++++++++ .../modules/survey_form/survey_form.routes.js | 44 +++++ .../survey_form/survey_form.service.js | 23 +++ .../survey_form/templates/action.cell.html | 28 +++ .../templates/choice_filter.cell.html | 6 + .../survey_form/templates/required.cell.html | 4 + .../templates/bhDataCollector.tmpl.html | 15 ++ .../templates/bhSurveyFormSelect.tmpl.html | 31 ++++ .../bhSurveyFormTypeSelect.tmpl.html | 30 +++ .../templates/bhSurveyListSelect.tmpl.html | 28 +++ server/config/routes.js | 8 + server/controllers/admin/surveyForm.js | 151 +++++++++++++++ server/models/bhima.sql | 27 +++ server/models/schema.sql | 30 +++ .../choiceListManagement.page.js | 2 +- .../shared/components/bhDataCollector.js | 14 ++ .../components/bhSurveyFormTypeSelect.js | 17 ++ .../shared/components/bhSurveyListSelect.js | 17 ++ test/end-to-end/shared/components/index.js | 3 + test/end-to-end/surveyForm/surveyForm.page.js | 82 +++++++++ test/end-to-end/surveyForm/surveyForm.spec.js | 51 ++++++ test/integration/choiceListManagement.js | 2 +- test/integration/surveyForm.js | 106 +++++++++++ 31 files changed, 1377 insertions(+), 4 deletions(-) create mode 100644 client/src/js/components/bhDataCollector.js create mode 100644 client/src/js/components/bhSurveyFormTypeSelect.js create mode 100644 client/src/js/components/bhSurveyListSelect.js create mode 100644 client/src/modules/survey_form/modals/survey_form.modals.html create mode 100644 client/src/modules/survey_form/modals/survey_form.modals.js create mode 100644 client/src/modules/survey_form/survey_form.html create mode 100644 client/src/modules/survey_form/survey_form.js create mode 100644 client/src/modules/survey_form/survey_form.routes.js create mode 100644 client/src/modules/survey_form/survey_form.service.js create mode 100644 client/src/modules/survey_form/templates/action.cell.html create mode 100644 client/src/modules/survey_form/templates/choice_filter.cell.html create mode 100644 client/src/modules/survey_form/templates/required.cell.html create mode 100644 client/src/modules/templates/bhDataCollector.tmpl.html create mode 100644 client/src/modules/templates/bhSurveyFormSelect.tmpl.html create mode 100644 client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html create mode 100644 client/src/modules/templates/bhSurveyListSelect.tmpl.html create mode 100644 server/controllers/admin/surveyForm.js create mode 100644 test/end-to-end/shared/components/bhDataCollector.js create mode 100644 test/end-to-end/shared/components/bhSurveyFormTypeSelect.js create mode 100644 test/end-to-end/shared/components/bhSurveyListSelect.js create mode 100644 test/end-to-end/surveyForm/surveyForm.page.js create mode 100644 test/end-to-end/surveyForm/surveyForm.spec.js create mode 100644 test/integration/surveyForm.js diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index 40fddb4f54..e02c1b2fce 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -299,6 +299,7 @@ "ON": "On", "BY_ID": "By Id", "BY_NAME": "By Name", + "CALCULATION": "Calculation", "CAN_EDIT_ROLES" : "Ability to edit roles", "CANCEL": "Cancel", "CANCELED": "Canceled", @@ -314,6 +315,8 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Prepayment Amount", "CHARGE": "Cost", + "CHOICE_FILTER": "Choice Filter", + "CHOICE_FILTER_FROM": "Choice Filter from", "CHOICE_LIST": "Choice list", "CLIENT": "Client", "CLIENT_ID": "Client ID", @@ -323,6 +326,7 @@ "COLUMNS": "Columns", "COMMENT": "Comment", "CONFIRMATION": "Confirmation", + "CONSTRAINT": "Constraint", "CONTACT": "Contact", "CONTACT_ADMIN": "Please contact the administrator", "CONVERSION_RATE": "Conversion rate", @@ -364,6 +368,8 @@ "DEBTOR_GROUP_FORM": "Form debtor group record", "DEDUCTION" : "Deduction", "DEFINE_UNTIL_DATE": "Define a limit date", + "DEFAULT": "Default", + "DEFAULTS": "Default Filters", "DEFAULT_QUANTITY": "Default Quantity", "DEBTOR_BALANCE_REMAINING": "Debtor's Remaining Balance", "DECREASE": "Decrease", @@ -373,7 +379,6 @@ "DESIGNATION": "Designation", "DETAIL_PREVIOUS": "Previous Year Details", "DETAILS": "Details", - "DEFAULTS": "Default Filters", "SEARCH_QUERIES": "Search Queries", "DEBTOR_CREDITOR": "Debtor/Creditor", "DELAY": "Delay", @@ -415,6 +420,7 @@ "FAX": "Fax", "FEMALE": "Female", "FIXED_CHARGE": "Fixed Cost", + "FORM": "Form", "RECORDS": "Records (Rows)", "FILE_NAME": "File Name", "HEALTH_ZONE":"Health Zone", @@ -455,7 +461,9 @@ "HOSPITAL_FILE_NR": "Hospital File Number", "HOSPITAL_NO": "Hospital No.", "HIDDEN": "Hidden", + "HINT": "Hint", "ID": "ID", + "IMAGE": "Image", "INCLUDE_DATE_INTERVAL": "Include date interval", "INCOME": "Income", "INCOME_EXPENSE": "Income and Expenses", @@ -603,6 +611,7 @@ "REGISTRATION_NUMBER": "Registration number", "RELIGION": "Religion", "RESPONSABILITY" : "Responsability", + "REQUIRED": "Required", "RESULT": "Results", "RESULT_ACCOUNT_SCT": "Result Account section", "RETYPE": "Retype", @@ -615,6 +624,8 @@ "SECOND_NAME": "Last Name", "SECTOR": "Sector", "SELECT": "Select", + "SELECT_ONE": "Select One", + "SELECT_MULTIPLE": "Select Multiple", "SENIORITY_BONUS": "seniority bonus", "SERVICE": "Service", "SET_DATE": "Change Date", @@ -653,6 +664,7 @@ "THIS_WEEK": "This Week", "THIS_YEAR": "This Year", "THIRD_EXPENSE_ACCOUNT": "Third party Accounts / Expense Accounts", + "TIME": "Time", "TITLE": "Title", "TITLE_ACCOUNT": "Title Account", "TODAY": "Today", @@ -779,6 +791,7 @@ "ACCOUNT": "Enter an account", "ACCOUNT_REFERENCE" : "Accounts References", "CASHBOX": "Enter the cashbox", + "CHOICE_FILTER": "Choice Filter", "CODE": "Enter code", "COUNTRY": "Enter country", "CREDITOR": "Enter creditor", @@ -869,6 +882,8 @@ "ROOT_ACCOUNT": "Select a Root Account", "RUBRIC_CONFIGURATION": "Select Rubrics Configuration", "SECTOR": "Select a sector", + "SELECT_CHOICE_LIST": "Select a choice list", + "SELECT_FILTER": "Select filter", "SELECT_GROUP": "Select Group Label", "SELECT_PARENT": "Select a Parent", "SELECT_PERIOD": "Select a payment period", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index cf75210fee..4cb9abda5c 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -303,6 +303,7 @@ "ON": "Sur", "BY_ID": "Par id", "BY_NAME": "Par nom", + "CALCULATION": "Calcul", "CANCEL": "Annuler", "CANCELED": "Annulée", "CASH_JOURNAL": "Journal Caisse", @@ -317,6 +318,8 @@ "CAUTION": "Caution", "CAUTION_AMOUNT": "Total de la Caution", "CHARGE": "Charge", + "CHOICE_FILTER": "Filtre", + "CHOICE_FILTER_FROM": "Filtrer le choix à partir de", "CHOICE_LIST": "Liste de choix", "CLIENT": "Client", "CLIENT_ID": "Identifiant client", @@ -334,6 +337,7 @@ "CONVENTION": "Convention", "COUNTRY": "Pays", "CONSUMABLE": "Consommable", + "CONSTRAINT": "Contrainte", "COMPLETE": "complet", "INCOMPLETE": "incomplet", "UNCONSUMABLE": "Non consommable", @@ -371,11 +375,12 @@ "DEBTOR_BALANCE_REMAINING": "Solde Restant du Débiteur", "DECREASE" : "Dimunition", "DEDUCTION" : "Contribution ou retenue", + "DEFAULT": "Valeur par défaut", + "DEFAULTS": "Filtres par défaut", "DEPARTMENT" : "Departement", "DEPOT": "Dépôt", "DESCRIPTION": "Description", "DETAILS": "Détails", - "DEFAULTS": "Filtres par défaut", "SEARCH_QUERIES": "Requêtes de recherche", "DEFAULT_QUANTITY": "Quantité par Défaut", "DETAIL_PREVIOUS": "Detailler Année Précédente", @@ -421,6 +426,7 @@ "FEMALE": "Femme", "RECORDS": "Enregistrements (Lignes)", "FILE_NAME": "Nom de fichier", + "FORM": "Formulaire", "COLS_ALL": "Toutes les colonnes", "COLS_VISIBLE": "Les colonnes visibles", "COLS_SELECTED": "Les colonnes selectionnées", @@ -456,7 +462,9 @@ "HEALTH_ZONE":"Zone de santé", "HEALTH_AREA":"Air de santé", "HIDDEN": "Caché", + "HINT": "Indice", "ID": "ID", + "IMAGE": "Image", "INCOME": "Recettes", "INCOME_EXPENSE": "Recettes et dépenses", "INCREASE": "Augmentation", @@ -609,6 +617,7 @@ "REGISTRATION_NUMBER": "Matricule", "RELIGION": "Religion", "RESPONSABILITY" : "Responsabilité", + "REQUIRED": "Champ obligatoire", "RESULT": "Resultats", "RESULT_ACCOUNT_SCT": "Section Compte de Résultat", "RETYPE": "Retaper", @@ -620,6 +629,8 @@ "SECOND_NAME": "Nom", "SECTOR": "Secteur", "SELECT": "Sélectionner", + "SELECT_ONE": "Sélection Unique", + "SELECT_MULTIPLE": "Sélection Multiple", "SENIORITY_BONUS": "Prime d'ancienneté", "SERVICE": "Service", "SERVICES": "Services", @@ -661,6 +672,7 @@ "THIS_MONTH": "Ce Mois", "THIS_WEEK": "Cette Semaine", "THIS_YEAR": "Cette Année", + "TIME": "Heure", "TITLE": "Titre", "TITLE_ACCOUNT": "Comptes Titre", "TO": "à", @@ -780,6 +792,7 @@ "ACCOUNT": "Entrer le compte", "ACCOUNT_REFERENCE" : "Références de comptes", "CASHBOX": "Entrer la caisse", + "CHOICE_FILTER": "Filtre", "CODE": "Entrer le code", "COUNTRY": "Entrer le nom du pays", "CREDITOR": "Entrer un Créditeur", @@ -870,6 +883,8 @@ "RUBRIC_CONFIGURATION": "Sélectionner la configuration des rubriques", "PROJECTS": "Sélection des projets", "SECTOR": "Sélectionner un secteur", + "SELECT_CHOICE_LIST": "Sélectionner une liste de choix", + "SELECT_FILTER": "Séléctionner le filtre", "SELECT_GROUP": "Sélectionner l'étiquette du groupe", "SELECT_PARENT": "Sélectionner un Parent", "SELECT_PERIOD": "Sélectionner une période de paiement", diff --git a/client/src/js/components/bhDataCollector.js b/client/src/js/components/bhDataCollector.js new file mode 100644 index 0000000000..7cffe63bfa --- /dev/null +++ b/client/src/js/components/bhDataCollector.js @@ -0,0 +1,48 @@ +angular.module('bhima.components') + .component('bhDataCollector', { + templateUrl : 'modules/templates/bhDataCollector.tmpl.html', + controller : DataCollectorController, + bindings : { + onUpdate : '&', + }, + }); + +DataCollectorController.$inject = ['DataCollectorManagementService', 'AppCache', 'Store', 'NotifyService']; + +/** + * Data Collector Controller + */ +function DataCollectorController(DataCollectorManagement, AppCache, Store, Notify) { + const ctrl = this; + const cache = new AppCache('dataCollectorManagement'); + + this.$onInit = function $onInit() { + DataCollectorManagement.read() + .then((dataCollectors) => { + ctrl.dataCollectors = new Store(); + ctrl.dataCollectors.setData(dataCollectors); + loadDefaultDataCollector(); + }) + .catch(Notify.handleError); + }; + + ctrl.update = function update(dataCollector) { + if (dataCollector) { + ctrl.selectedDataCollector = dataCollector; + + // update cache with id to select this data Collector object on next load + cache.selectedDataCollectorId = dataCollector.id; + + // update bindings + ctrl.onUpdate({ dataCollectorId : dataCollector.id }); + } + }; + + function loadDefaultDataCollector() { + // if the cache exists - use that + const cached = cache.selectedDataCollectorId; + if (cached) { + ctrl.update(ctrl.dataCollectors.get(cached)); + } + } +} diff --git a/client/src/js/components/bhSurveyFormTypeSelect.js b/client/src/js/components/bhSurveyFormTypeSelect.js new file mode 100644 index 0000000000..c7256e2bf0 --- /dev/null +++ b/client/src/js/components/bhSurveyFormTypeSelect.js @@ -0,0 +1,51 @@ +angular.module('bhima.components') + .component('bhSurveyFormTypeSelect', { + templateUrl : 'modules/templates/bhSurveyFormTypeSelect.tmpl.html', + controller : SurveyFormTypeSelectController, + transclude : true, + bindings : { + onSelectCallback : '&', + typeElement : '<', + required : ' { + // translated label for the form input + $ctrl.label = $ctrl.label || 'FORM.SELECT.TYPE'; + + // load all Survey Form Type + SurveyForm.listSurveyformtype() + .then(surveyTypes => { + surveyTypes.forEach((item) => { + item.plainText = $translate.instant(item.label); + }); + + $ctrl.surveyTypes = surveyTypes; + }) + .catch(Notify.handleError); + }; + + $ctrl.$onChanges = (changes) => { + if (changes.typeElement && changes.typeElement.currentValue) { + $ctrl.typeElement = parseInt(changes.typeElement.currentValue, 10); + } + }; + + // fires the onSelectCallback bound to the component boundary + $ctrl.onSelect = surveyType => { + $ctrl.onSelectCallback({ surveyType }); + }; +} diff --git a/client/src/js/components/bhSurveyListSelect.js b/client/src/js/components/bhSurveyListSelect.js new file mode 100644 index 0000000000..2089136011 --- /dev/null +++ b/client/src/js/components/bhSurveyListSelect.js @@ -0,0 +1,36 @@ +angular.module('bhima.components') + .component('bhSurveyListSelect', { + templateUrl : 'modules/templates/bhSurveyListSelect.tmpl.html', + controller : SurveyListController, + transclude : true, + bindings : { + onSelectCallback : '&', + survey : ' { + $ctrl.items = items; + }); + }; + + $ctrl.onSelect = survey => $ctrl.onSelectCallback({ survey }); +} diff --git a/client/src/modules/survey_form/modals/survey_form.modals.html b/client/src/modules/survey_form/modals/survey_form.modals.html new file mode 100644 index 0000000000..e2f931cef3 --- /dev/null +++ b/client/src/modules/survey_form/modals/survey_form.modals.html @@ -0,0 +1,173 @@ +
+
+
    +
  1. TREE.ADMIN
    2. + +
  2. + TREE.SURVEY_FORM + +
    3. +
  3. + TREE.SURVEY_FORM + +
    4. +
+
+ +
+

+ + {{ SurveyFormModalCtrl.dataCollector.label }} + +

+
+ +
+ + + + +
+ + + + + + + +
+ + +
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ + + + + + + +
+ +
+

+ FORM.INFO.NO_CHANGE +

+ +

+ FORM.ERRORS.GENERIC +

+ + + + + FORM.BUTTONS.SUBMIT + +
+
\ No newline at end of file diff --git a/client/src/modules/survey_form/modals/survey_form.modals.js b/client/src/modules/survey_form/modals/survey_form.modals.js new file mode 100644 index 0000000000..a0a7d77b5d --- /dev/null +++ b/client/src/modules/survey_form/modals/survey_form.modals.js @@ -0,0 +1,104 @@ +angular.module('bhima.controllers') + .controller('SurveyFormModalController', SurveyFormModalController); + +SurveyFormModalController.$inject = [ + '$state', 'SurveyFormService', 'NotifyService', 'appcache', 'DataCollectorManagementService', +]; + +/** + * SURVEY FORM Modal Controller + */ + +function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCollectorManagement) { + const vm = this; + const cache = AppCache('AccountReferenceModal'); + + vm.surveyForm = {}; + vm.stateParams = {}; + + // exposed methods + vm.submit = submit; + vm.closeModal = closeModal; + vm.clear = clear; + vm.selectType = selectType; + vm.onSelectList = onSelectList; + vm.onSelectSurvey = onSelectSurvey; + + function selectType(type) { + vm.surveyForm.type = type.id; + if (type.is_list) { + vm.selectList = true; + } else { + vm.selectList = false; + } + } + + function onSelectList(list) { + vm.surveyForm.choice_list_id = list.id; + } + + function onSelectSurvey(survey) { + vm.surveyForm.filter_choice_list_id = survey.id; + } + + if ($state.params.collectorId) { + vm.surveyForm.data_collector_management_id = $state.params.collectorId; + + DataCollectorManagement.read($state.params.collectorId) + .then(data => { + vm.dataCollector = data; + }) + .catch(Notify.handleError); + } + + if ($state.params.creating || $state.params.id) { + cache.stateParams = $state.params; + vm.stateParams = cache.stateParams; + } else { + vm.stateParams = cache.stateParams; + } + vm.isCreating = vm.stateParams.creating; + + if (!vm.isCreating) { + SurveyForm.read(vm.stateParams.id) + .then(data => { + vm.selectList = data.choice_list_id; + vm.surveyForm = data; + }) + .catch(Notify.handleError); + } + + // load SURVEY FORM + SurveyForm.read() + .then(surveyForms => { + vm.surveyForms = surveyForms; + }) + .catch(Notify.handleError); + + // submit the data to the server from all two forms (update, create) + function submit(surveyForm) { + vm.hasNoChange = surveyForm.$submitted && surveyForm.$pristine && !vm.isCreating; + if (surveyForm.$invalid) { return null; } + if (!surveyForm.$dirty) { return null; } + + const promise = (vm.isCreating) + ? SurveyForm.create(vm.surveyForm) + : SurveyForm.update(vm.surveyForm.id, vm.surveyForm); + + return promise + .then(() => { + const translateKey = (vm.isCreating) ? 'FORM.INFO.CREATE_SUCCESS' : 'FORM.INFO.UPDATE_SUCCESS'; + Notify.success(translateKey); + $state.go('survey_form', null, { reload : true }); + }) + .catch(Notify.handleError); + } + + function clear(value) { + vm.surveyForm[value] = null; + } + + function closeModal() { + $state.transitionTo('survey_form'); + } +} diff --git a/client/src/modules/survey_form/survey_form.html b/client/src/modules/survey_form/survey_form.html new file mode 100644 index 0000000000..af9b654ad7 --- /dev/null +++ b/client/src/modules/survey_form/survey_form.html @@ -0,0 +1,52 @@ +
+
+
    +
  1. TREE.ADMIN
    2. +
  2. TREE.SURVEY_FORM
    3. +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+
+
+
+ + +
+
+
+ + + +
+
+
+ \ No newline at end of file diff --git a/client/src/modules/survey_form/survey_form.js b/client/src/modules/survey_form/survey_form.js new file mode 100644 index 0000000000..b419c72088 --- /dev/null +++ b/client/src/modules/survey_form/survey_form.js @@ -0,0 +1,164 @@ +angular.module('bhima.controllers') + .controller('SurveyFormController', SurveyFormController); + +SurveyFormController.$inject = [ + '$state', 'SurveyFormService', 'NotifyService', 'uiGridConstants', 'ModalService', '$translate', +]; + +/** + * SURVEY FORM Controller + * This module is responsible for handling the CRUD operation on SURVEY FORM + */ + +function SurveyFormController($state, SurveyForm, Notify, uiGridConstants, ModalService, $translate) { + const vm = this; + vm.gridApi = {}; + vm.filterEnabled = false; + vm.toggleFilter = toggleFilter; + vm.dataCollectorSelect = dataCollectorSelect; + + // options for the UI grid + vm.gridOptions = { + appScopeProvider : vm, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + enableSorting : true, + onRegisterApi : onRegisterApiFn, + columnDefs : [ + { + field : 'typeChoice', + displayName : 'FORM.LABELS.TYPE', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'name', + displayName : 'FORM.LABELS.VARIABLE_NAME', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'label', + displayName : 'FORM.LABELS.DESIGNATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'hint', + displayName : 'FORM.LABELS.HINT', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'required', + displayName : 'FORM.LABELS.REQUIRED', + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/survey_form/templates/required.cell.html', + }, + { + field : 'filter_choice_list_id', + displayName : 'FORM.LABELS.CHOICE_FILTER', + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/survey_form/templates/choice_filter.cell.html', + }, + { + field : 'constraint', + displayName : 'FORM.LABELS.CONSTRAINT', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'default', + displayName : 'FORM.LABELS.DEFAULT', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'calculation', + displayName : 'FORM.LABELS.CALCULATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'action', + displayName : '', + enableFiltering : 'false', + cellTemplate : '/modules/survey_form/templates/action.cell.html', + }, + ], + }; + function onRegisterApiFn(gridApi) { + vm.gridApi = gridApi; + } + + function toggleFilter() { + vm.filterEnabled = !vm.filterEnabled; + vm.gridOptions.enableFiltering = vm.filterEnabled; + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + // bind methods + vm.edit = edit; + vm.remove = remove; + + function edit(surveyForm) { + $state.go('survey_form.edit', { id : surveyForm.id, collectorId : vm.collectorId }); + } + + function remove(id) { + ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') + .then(() => { + SurveyForm.delete(id) + .then(() => { + Notify.success('FORM.INFO.DELETE_SUCCESS'); + loadGrid(); + }) + .catch(Notify.handleError); + }); + } + + function handleError(error) { + vm.hasError = true; + Notify.handleError(error); + } + + function dataCollectorSelect(collectorId) { + vm.collectorId = collectorId; + + if (vm.collectorId) { + loadGrid(); + } + } + + // load user grid + function loadGrid() { + toggleLoadingIndicator(); + vm.hasError = false; + vm.loading = true; + const otherChoice = $translate.instant('FORM.LABELS.OTHER'); + + SurveyForm.read(null, { data_collector_management_id : vm.collectorId }) + .then((surveyForm) => { + surveyForm.forEach(item => { + item.typeLabel = $translate.instant(item.typeLabel); + item.choiceListLabel = $translate.instant(item.choiceListLabel); + item.other_choice = item.other_choice ? `( ${otherChoice} )` : ''; + item.typeChoice = item.choiceListLabel ? `${item.typeLabel} / ${item.choiceListLabel} ${item.other_choice}` + : item.typeLabel; + }); + + vm.gridOptions.data = surveyForm; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + + function toggleLoadingIndicator() { + vm.loading = false; + } + + loadGrid(); +} diff --git a/client/src/modules/survey_form/survey_form.routes.js b/client/src/modules/survey_form/survey_form.routes.js new file mode 100644 index 0000000000..cf9d3cf106 --- /dev/null +++ b/client/src/modules/survey_form/survey_form.routes.js @@ -0,0 +1,44 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('survey_form', { + url : '/survey_form', + controller : 'SurveyFormController as SurveyFormCtrl', + templateUrl : 'modules/survey_form/survey_form.html', + }) + + .state('survey_form.create', { + url : '/create', + params : { + survey_form : { value : null }, + creating : { value : true }, + collectorId : { value : true }, + }, + onEnter : ['$uibModal', surveyFormModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('survey_form.edit', { + url : '/:id/edit', + params : { + survey_form : { value : null }, + creating : { value : false }, + collectorId : { value : true }, + }, + onEnter : ['$uibModal', surveyFormModal], + onExit : ['$uibModalStack', closeModal], + }); + }]); + +function surveyFormModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/survey_form/modals/survey_form.modals.html', + controller : 'SurveyFormModalController as SurveyFormModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/survey_form/survey_form.service.js b/client/src/modules/survey_form/survey_form.service.js new file mode 100644 index 0000000000..8ac6f272ad --- /dev/null +++ b/client/src/modules/survey_form/survey_form.service.js @@ -0,0 +1,23 @@ +angular.module('bhima.services') + .service('SurveyFormService', SurveyFormService); + +SurveyFormService.$inject = ['PrototypeApiService']; + +/** + * @class SurveyFormService + * @extends PrototypeApiService + * + * @description + * Encapsulates common requests to the /survey_form/ URL. + */ +function SurveyFormService(Api) { + const service = new Api('/survey_form/'); + service.listSurveyformtype = listSurveyformtype; + + function listSurveyformtype() { + const url = ''.concat('listSurveyformtype'); + return Api.read.call(service, url); + } + + return service; +} diff --git a/client/src/modules/survey_form/templates/action.cell.html b/client/src/modules/survey_form/templates/action.cell.html new file mode 100644 index 0000000000..0ba1f5fe49 --- /dev/null +++ b/client/src/modules/survey_form/templates/action.cell.html @@ -0,0 +1,28 @@ +
+ + FORM.BUTTONS.ACTIONS + + + + +
diff --git a/client/src/modules/survey_form/templates/choice_filter.cell.html b/client/src/modules/survey_form/templates/choice_filter.cell.html new file mode 100644 index 0000000000..cb32090184 --- /dev/null +++ b/client/src/modules/survey_form/templates/choice_filter.cell.html @@ -0,0 +1,6 @@ +
+ + + {{ row.entity.filterLabel }} + +
\ No newline at end of file diff --git a/client/src/modules/survey_form/templates/required.cell.html b/client/src/modules/survey_form/templates/required.cell.html new file mode 100644 index 0000000000..7601d7ee18 --- /dev/null +++ b/client/src/modules/survey_form/templates/required.cell.html @@ -0,0 +1,4 @@ +
+ + +
diff --git a/client/src/modules/templates/bhDataCollector.tmpl.html b/client/src/modules/templates/bhDataCollector.tmpl.html new file mode 100644 index 0000000000..23f70f939b --- /dev/null +++ b/client/src/modules/templates/bhDataCollector.tmpl.html @@ -0,0 +1,15 @@ +
+ + FORM.LABELS.FORM + + + +
diff --git a/client/src/modules/templates/bhSurveyFormSelect.tmpl.html b/client/src/modules/templates/bhSurveyFormSelect.tmpl.html new file mode 100644 index 0000000000..cd11efe8c9 --- /dev/null +++ b/client/src/modules/templates/bhSurveyFormSelect.tmpl.html @@ -0,0 +1,31 @@ +
+
+ + + + + + + + {{$select.selected.label}} + + + + + + +
+
+
+
+
diff --git a/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html b/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html new file mode 100644 index 0000000000..d3d1005c2a --- /dev/null +++ b/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html @@ -0,0 +1,30 @@ +
+
+ + + + + + + {{ $select.selected.plainText }} + + + + + + +
+
+
+
+
\ No newline at end of file diff --git a/client/src/modules/templates/bhSurveyListSelect.tmpl.html b/client/src/modules/templates/bhSurveyListSelect.tmpl.html new file mode 100644 index 0000000000..74bce458c9 --- /dev/null +++ b/client/src/modules/templates/bhSurveyListSelect.tmpl.html @@ -0,0 +1,28 @@ +
+
+ + + + + + {{ $select.selected.label }} + + + + + + +
+
+
+
+
\ No newline at end of file diff --git a/server/config/routes.js b/server/config/routes.js index 2a824dc369..3bf5cc7fa0 100644 --- a/server/config/routes.js +++ b/server/config/routes.js @@ -146,6 +146,7 @@ const indicatorRerpor = require('../controllers/finance/indicator/dashboard/repo // Data Kit const dataCollectorManagement = require('../controllers/admin/dataCollectorManagement'); const choicesListManagement = require('../controllers/admin/choicesListManagement'); +const surveyForm = require('../controllers/admin/surveyForm'); // expose routes to the server. exports.configure = function configure(app) { @@ -995,5 +996,12 @@ exports.configure = function configure(app) { app.put('/choices_list_management/:id', choicesListManagement.update); app.delete('/choices_list_management/:id', choicesListManagement.delete); + // API for SURVEY FORM routes crud + app.get('/survey_form', surveyForm.list); + app.get('/survey_form/listSurveyformtype', surveyForm.listSurveyformtype); + app.get('/survey_form/:id', surveyForm.detail); + app.post('/survey_form', surveyForm.create); + app.put('/survey_form/:id', surveyForm.update); + app.delete('/survey_form/:id', surveyForm.delete); }; diff --git a/server/controllers/admin/surveyForm.js b/server/controllers/admin/surveyForm.js new file mode 100644 index 0000000000..2b60c32b46 --- /dev/null +++ b/server/controllers/admin/surveyForm.js @@ -0,0 +1,151 @@ +/** +* SURVEY FORM Controller +* +* This controller exposes an API to the client for reading and writing SURVEY FORM +*/ + +const db = require('../../lib/db'); +const NotFound = require('../../lib/errors/NotFound'); +const FilterParser = require('../../lib/filter'); + +// GET /survey_form +function lookupSurveyForm(id) { + const sql = ` + SELECT s.id, s.data_collector_management_id, s.type, s.name, s.label, s.hint, s.required, s.constraint, + s.default, s.calculation, s.choice_list_id, s.filter_choice_list_id, s.other_choice + FROM survey_form AS s + WHERE s.id = ?`; + + return db.one(sql, [id]); +} + +function getSurveyFormElement(params) { + const filters = new FilterParser(params, { tableAlias : 's' }); + + const sql = ` + SELECT s.id, s.data_collector_management_id, s.type, s.name, s.label, + s.hint, s.filter_choice_list_id, s.required, s.constraint, s.default, + s.calculation, s.choice_list_id, s.other_choice, d.label AS data_collector_label, + d.color, d.description, d.version_number, sft.label AS typeLabel, + cl.label AS choiceListLabel, sft.is_list, f.name AS filterLabel, + sft.label AS labelType, sft.type AS typeForm + FROM survey_form AS s + JOIN survey_form_type AS sft ON sft.id = s.type + JOIN data_collector_management AS d ON d.id = s.data_collector_management_id + LEFT JOIN survey_form AS f ON f.id = s.filter_choice_list_id + LEFT JOIN choices_list_management AS cl On cl.id = s.choice_list_id`; + + filters.equals('data_collector_management_id'); + filters.equals('is_list', 'is_list', 'sft'); + + const query = filters.applyQuery(sql); + const parameters = filters.parameters(); + + return db.exec(query, parameters); +} + +function list(req, res, next) { + getSurveyFormElement(req.query) + .then((rows) => { + res.status(200).json(rows); + }) + .catch(next) + .done(); +} + +// List of Survey Form Type +function listSurveyformtype(req, res, next) { + const sql = `SELECT id, label, type, is_list FROM survey_form_type;`; + + db.exec(sql) + .then((rows) => { + res.status(200).json(rows); + }) + .catch(next) + .done(); +} + +/** +* GET /fill_form/:UUID +* +* Returns the detail of a single survey_form +*/ +function detail(req, res, next) { + const { id } = req.params; + + lookupSurveyForm(id) + .then((record) => { + res.status(200).json(record); + }) + .catch(next) + .done(); +} + + +// POST /survey_form +function create(req, res, next) { + const sql = `INSERT INTO survey_form SET ?`; + const data = req.body; + + db.exec(sql, [data]) + .then((row) => { + res.status(201).json({ id : row.insertId }); + }) + .catch(next) + .done(); +} + + +// PUT /survey_form /:id +function update(req, res, next) { + const sql = `UPDATE survey_form SET ? WHERE id = ?;`; + + db.exec(sql, [req.body, req.params.id]) + .then(() => { + return lookupSurveyForm(req.params.id); + }) + .then((record) => { + // all updates completed successfull, return full object to client + res.status(200).json(record); + }) + .catch(next) + .done(); +} + +// DELETE /survey_form/:id +function remove(req, res, next) { + const sql = `DELETE FROM survey_form WHERE id = ?;`; + + db.exec(sql, [req.params.id]) + .then((row) => { + // if nothing happened, let the client know via a 404 error + if (row.affectedRows === 0) { + throw new NotFound(`Could not find a function with id ${req.params.id}`); + } + + res.status(204).json(); + }) + .catch(next) + .done(); +} + +// get list of surveyForm element +exports.list = list; + +// get details of a surveyForm +exports.detail = detail; + +// create a new surveyForm +exports.create = create; + +// update surveyForm informations +exports.update = update; + +// Delete a surveyForm +exports.delete = remove; + +// get list of List of survey form +exports.listSurveyformtype = listSurveyformtype; + +// get survey form element +exports.getSurveyFormElement = getSurveyFormElement; diff --git a/server/models/bhima.sql b/server/models/bhima.sql index afe3e5c596..dc86248f49 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -396,4 +396,31 @@ INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (22, 'medicament', 'Médicament', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (23, 'ciprofloxacineCifin', 'ciprofloxacine (cifin ) 500 mg tab', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (24, 'artesunate60mgInjFl', 'Artesunate 60mg inj. fl', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (25, 'vitamineA50000iu', 'Vitamine A 50.000 iu', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (26, 'paracetamol500mg', 'Paracetamol500 mg', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (27, 'pentazocinetromadol30mg/ml', 'Pentazocine, Tromadol30mg/ml', 0, 22, 22, 0, 0); + +-- Survey Form Type +INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES + ('FORM.LABELS.NUMBER', 'number', 0), + ('FORM.LABELS.TEXT', 'text', 0), + ('FORM.LABELS.SELECT_ONE', 'select_one', 1), + ('FORM.LABELS.SELECT_MULTIPLE', 'select_multiple', 1), + ('FORM.LABELS.NOTE', 'note', 0), + ('FORM.LABELS.DATE', 'date', 0), + ('FORM.LABELS.TIME', 'time', 0), + ('FORM.LABELS.IMAGE', 'image', 0), + ('FORM.LABELS.CALCULATION', 'calculation', 0); + +-- survey_form +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (1, 1, '3', 22, NULL, 0, 'medicament', 'Médicament', 'Sélectionner le médicament', 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (2, 1, '1', NULL, NULL, 0, 'poids', 'Poids', NULL, 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (3, 1, '2', NULL, NULL, 0, 'dosekilos', 'Dose par kilogramme', NULL, 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (4, 1, '1', NULL, NULL, 0, 'nombreFois', 'Nombre de fois', NULL, 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (5, 1, '2', NULL, NULL, 0, 'voie', 'Voie', NULL, 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (6, 1, '6', NULL, NULL, 0, 'date', 'Date', NULL, 1, NULL, NULL, NULL); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (7, 1, '7', NULL, NULL, 0, 'temps', 'Temps', NULL, 1, NULL, NULL, NULL); diff --git a/server/models/schema.sql b/server/models/schema.sql index 0ef5457dec..1853a20bc9 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2384,4 +2384,34 @@ CREATE TABLE `choices_list_management` ( UNIQUE KEY `choices_list_management_1` (`label`, `name`, `parent`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `survey_form`; +CREATE TABLE `survey_form` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `type` VARCHAR(100) NOT NULL, + `choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `filter_choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `other_choice` tinyint(1) DEFAULT 0, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `hint` TEXT, + `required` tinyint(1) DEFAULT 0, + `constraint` VARCHAR(100) NULL, + `default` VARCHAR(100) NULL, + `calculation` VARCHAR(100) NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `survey_form_1` (`data_collector_management_id`, `name`, `label`), + KEY `data_collector_management_id` (`data_collector_management_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_form_type`; +CREATE TABLE `survey_form_type` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `type` VARCHAR(100) NOT NULL, + `is_list` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + SET foreign_key_checks = 1; diff --git a/test/end-to-end/choiceListManagement/choiceListManagement.page.js b/test/end-to-end/choiceListManagement/choiceListManagement.page.js index 5b29aab1aa..13b136cee4 100644 --- a/test/end-to-end/choiceListManagement/choiceListManagement.page.js +++ b/test/end-to-end/choiceListManagement/choiceListManagement.page.js @@ -19,7 +19,7 @@ class ChoiceListManagementPage { } /** - * simulate the create PayrollConfig button click to show the dialog of creation + * simulate the create Choice list button click to show the dialog of creation */ async create(ChoiceListElement) { await FU.buttons.create(); diff --git a/test/end-to-end/shared/components/bhDataCollector.js b/test/end-to-end/shared/components/bhDataCollector.js new file mode 100644 index 0000000000..d5ce788aea --- /dev/null +++ b/test/end-to-end/shared/components/bhDataCollector.js @@ -0,0 +1,14 @@ +/* global element, by */ + +module.exports = { + selector : '[bh-data-collector]', + set : async function set(dataCollector) { + // get the dropdown + const dropdown = element(by.css('[uib-dropdown-toggle]')); + await dropdown.click(); + + // click the correct dropdown item + const option = element(by.linkText(dataCollector)); + await option.click(); + }, +}; diff --git a/test/end-to-end/shared/components/bhSurveyFormTypeSelect.js b/test/end-to-end/shared/components/bhSurveyFormTypeSelect.js new file mode 100644 index 0000000000..19411e9224 --- /dev/null +++ b/test/end-to-end/shared/components/bhSurveyFormTypeSelect.js @@ -0,0 +1,17 @@ +/* global element, by */ + +const FU = require('../FormUtils'); + +module.exports = { + selector : '[bh-survey-form-type-select]', + set : async function set(surveyType, id) { + const locator = (id) ? by.id(id) : by.css(this.selector); + const target = element(locator); + + // hack to make sure previous 'blur' event fires if we are using + // ngModelOptions updateOn 'blur' for every input + await target.click(); + + await FU.uiSelect('$ctrl.typeElement', surveyType, target); + }, +}; diff --git a/test/end-to-end/shared/components/bhSurveyListSelect.js b/test/end-to-end/shared/components/bhSurveyListSelect.js new file mode 100644 index 0000000000..38215e151e --- /dev/null +++ b/test/end-to-end/shared/components/bhSurveyListSelect.js @@ -0,0 +1,17 @@ +/* global element, by */ + +const FU = require('../FormUtils'); + +module.exports = { + selector : '[bh-survey-list-select]', + set : async function set(survey, id) { + const locator = (id) ? by.id(id) : by.css(this.selector); + const target = element(locator); + + // hack to make sure previous 'blur' event fires if we are using + // ngModelOptions updateOn 'blur' for every input + await target.click(); + + await FU.uiSelect('$ctrl.survey', survey, target); + }, +}; diff --git a/test/end-to-end/shared/components/index.js b/test/end-to-end/shared/components/index.js index 153980d894..6545537e4d 100644 --- a/test/end-to-end/shared/components/index.js +++ b/test/end-to-end/shared/components/index.js @@ -72,4 +72,7 @@ module.exports = { entityGroupSelect : require('./bhEntityGroupSelect'), cronSelect : require('./bhCronSelect'), choiceListSelect : require('./bhChoiceListSelect'), + dataCollector : require('./bhDataCollector'), + surveyFormTypeSelect : require('./bhSurveyFormTypeSelect'), + surveyListSelect : require('./bhSurveyListSelect'), }; diff --git a/test/end-to-end/surveyForm/surveyForm.page.js b/test/end-to-end/surveyForm/surveyForm.page.js new file mode 100644 index 0000000000..d6f463c7bd --- /dev/null +++ b/test/end-to-end/surveyForm/surveyForm.page.js @@ -0,0 +1,82 @@ +/* global element, by */ +/* eslint */ + +/** + * This class is represents a Survey Form page in term of structure and + * behaviour so it is a Survey Form Management page object + */ + +/* loading grid actions */ +const GridRow = require('../shared/GridRow'); +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class SurveyFormManagementPage { + constructor() { + this.gridId = 'choices-list-management-grid'; + this.rubricGrid = element(by.id(this.gridId)); + this.actionLinkColumn = 5; + } + + /** + * simulate the create Survey Form button click to show the dialog of creation + */ + async create(SurveyForm) { + await components.dataCollector.set(SurveyForm.dataCollector); + await FU.buttons.create(); + await components.surveyFormTypeSelect.set(SurveyForm.type); + await FU.input('SurveyFormModalCtrl.surveyForm.name', SurveyForm.name); + await FU.input('SurveyFormModalCtrl.surveyForm.label', SurveyForm.label); + await FU.input('SurveyFormModalCtrl.surveyForm.hint', SurveyForm.hint); + await element(by.id('is_required')).click(); + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * simulate the create Survey Form button click to show the dialog of creation + */ + async createDeletable(SurveyForm) { + await FU.buttons.create(); + await components.surveyFormTypeSelect.set(SurveyForm.type); + await components.choiceListSelect.set(SurveyForm.choice_list_id); + await components.surveyListSelect.set(SurveyForm.filter_choice_list_id); + await FU.input('SurveyFormModalCtrl.surveyForm.name', SurveyForm.name); + await FU.input('SurveyFormModalCtrl.surveyForm.label', SurveyForm.label); + await element(by.id('is_required')).click(); + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * simulate a click on the edit link of a function + */ + async edit(label, updateSurveyForm) { + const row = new GridRow(label); + row.dropdown().click(); + row.edit().click(); + await components.surveyFormTypeSelect.set(updateSurveyForm.type); + await components.choiceListSelect.set(updateSurveyForm.choice_list_id); + await FU.input('SurveyFormModalCtrl.surveyForm.name', updateSurveyForm.name); + await FU.input('SurveyFormModalCtrl.surveyForm.label', updateSurveyForm.label); + await FU.input('SurveyFormModalCtrl.surveyForm.hint', updateSurveyForm.hint); + await element(by.id('is_required')).click(); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + /** + * simulate a click on the delete link of a function + */ + async delete(label) { + const row = new GridRow(label); + await row.dropdown().click(); + await row.remove().click(); + + await FU.modal.submit(); + await components.notification.hasSuccess(); + } +} + +module.exports = SurveyFormManagementPage; diff --git a/test/end-to-end/surveyForm/surveyForm.spec.js b/test/end-to-end/surveyForm/surveyForm.spec.js new file mode 100644 index 0000000000..40460e16f5 --- /dev/null +++ b/test/end-to-end/surveyForm/surveyForm.spec.js @@ -0,0 +1,51 @@ +const helpers = require('../shared/helpers'); +const SurveyFormManagement = require('./surveyForm.page'); + +describe('Survey Form Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/survey_form')); + + const Page = new SurveyFormManagement(); + + const newSurveyFormElement = { + dataCollector : 'Fiche Kardex', + type : 'Image', + label : 'Image du patient', + name : 'imagePatient', + hint : 'Veuillez renseigner le nom de l\' image', + }; + + // Sélection Multiple + + const updateSurveyFormElement = { + type : 'Sélection Multiple', + choice_list_id : 'Médicament', + name : 'medConsommes', + label : 'Médicaments consommés', + hint : 'Effacer', + }; + + const deleteListElement = { + type : 'Sélection Unique', + choice_list_id : 'Médicament', + filter_choice_list_id : 'Médicaments consommés', + name : 'ElementSup', + label : 'Element a supprimer', + }; + + it('successfully creates a new Survey Form Element', async () => { + await Page.create(newSurveyFormElement); + }); + + it('successfully edits a Survey Form Element', async () => { + await Page.edit(newSurveyFormElement.label, updateSurveyFormElement); + }); + + it('successfully creates a deletable element', async () => { + await Page.createDeletable(deleteListElement); + }); + + it('successfully delete a list Element', async () => { + await Page.delete(deleteListElement.label); + }); +}); diff --git a/test/integration/choiceListManagement.js b/test/integration/choiceListManagement.js index 34a52f689f..4d3a78a919 100644 --- a/test/integration/choiceListManagement.js +++ b/test/integration/choiceListManagement.js @@ -2,7 +2,7 @@ const helpers = require('./helpers'); describe('(/choices_list_management) Choice List Management', () => { - const numListElement = 22; + const numListElement = 28; const newElementList = { name : 'oshwe', diff --git a/test/integration/surveyForm.js b/test/integration/surveyForm.js new file mode 100644 index 0000000000..e65d6847e4 --- /dev/null +++ b/test/integration/surveyForm.js @@ -0,0 +1,106 @@ +/* global expect, agent */ +const helpers = require('./helpers'); + +describe('(/survey_form) Survey Form', () => { + const numListElement = 9; + + const formElement = { + data_collector_management_id : 1, + type : 8, + label : 'Image du patient', + name : 'imagePatient', + required : 1, + }; + + const formElement1 = { + data_collector_management_id : 1, + type : 4, + choice_list_id : 22, + name : 'medConsommes', + label : 'Médicaments consommés', + }; + + const updateFormElement = { + data_collector_management_id : 1, + type : '4', + name : 'medConsommes', + label : 'Médicaments consommés', + hint : 'Pas d\'indice dans cette base de données', + required : 1, + constraint : null, + default : null, + calculation : null, + choice_list_id : 22, + filter_choice_list_id : null, + other_choice : 0, + }; + + it('POST /survey_form add Form Element', () => { + return agent.post('/survey_form') + .send(formElement) + .then((res) => { + helpers.api.created(res); + formElement.id = res.body.id; + }) + .catch(helpers.handler); + }); + + it('POST /survey_form add Form Element', () => { + return agent.post('/survey_form') + .send(formElement1) + .then((res) => { + helpers.api.created(res); + formElement1.id = res.body.id; + }) + .catch(helpers.handler); + }); + + it('GET /survey_form/:id returns one survey form element detail', () => { + return agent.get(`/survey_form/${formElement.id}`) + .then((res) => { + expect(res).to.have.status(200); + + expect(res).to.be.a('object'); + expect(res.body).to.have.all.keys('id', 'data_collector_management_id', 'type', 'choice_list_id', + 'filter_choice_list_id', 'other_choice', 'name', 'label', 'hint', + 'required', 'constraint', 'default', 'calculation'); + }) + .catch(helpers.handler); + }); + + it('PUT /survey_form/:id updates the newly added Choice List Management', () => { + return agent.put(`/survey_form/${formElement1.id}`) + .send(updateFormElement) + .then((res) => { + expect(res).to.have.status(200); + expect(res).to.be.a('object'); + expect(res.body.id).to.equal(formElement1.id); + }) + .catch(helpers.handler); + }); + + it('GET /survey_form returns all Survey Form Element', () => { + return agent.get(`/survey_form/`) + .then((res) => { + helpers.api.listed(res, numListElement); + expect(res.body[0]).to.have.all.keys( + 'id', 'is_list', 'label', 'labelType', 'name', 'other_choice', 'required', + 'type', 'typeForm', 'typeLabel', 'version_number', 'calculation', 'choiceListLabel', + 'choice_list_id', 'color', 'constraint', 'data_collector_label', 'data_collector_management_id', + 'default', 'description', 'filterLabel', 'filter_choice_list_id', 'hint'); + }) + .catch(helpers.handler); + }); + + it('DELETE /survey_form/:id deletes a survey form element', () => { + return agent.delete(`/survey_form/${formElement.id}`) + .then((res) => { + helpers.api.deleted(res); + return agent.get(`/survey_form/${formElement.id}`); + }) + .then((res) => { + helpers.api.errored(res, 404); + }) + .catch(helpers.handler); + }); +}); From 454b1ab6ce28f4e0bd0e5210cf1dcfc1770764bc Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:22:15 +0100 Subject: [PATCH 05/30] Rebase with branch master --- client/src/i18n/en/form.json | 6 + client/src/i18n/en/table.json | 1 + client/src/i18n/en/tree.json | 4 + client/src/i18n/fr/form.json | 6 + client/src/i18n/fr/table.json | 1 + client/src/i18n/fr/tree.json | 4 + .../components/bhChoiceListMultipleSelect.js | 56 ++++ .../js/components/bhPatientMedicalSheet.js | 108 +++++++ .../src/js/components/bhSurveyFormSelect.js | 44 +++ .../src/js/services/receipts/ReceiptModal.js | 27 ++ .../js/services/receipts/ReceiptService.js | 11 + .../templates/consultation.cell.html | 21 +- .../display_metadata/display_metadata.html | 121 +++++++ .../display_metadata/display_metadata.js | 208 ++++++++++++ .../display_metadata.routes.js | 58 ++++ .../display_metadata.service.js | 116 +++++++ .../display_metadata/modals/search.modal.html | 109 +++++++ .../display_metadata/modals/search.modal.js | 107 +++++++ .../templates/action.cell.html | 33 ++ .../templates/choice_filter.cell.html | 6 + .../display_metadata/templates/date.cell.html | 4 + .../templates/required.cell.html | 4 + client/src/modules/fill_form/fill_form.html | 39 +++ client/src/modules/fill_form/fill_form.js | 119 +++++++ .../src/modules/fill_form/fill_form.routes.js | 43 +++ .../modules/fill_form/fill_form.service.js | 86 +++++ .../fill_form/modals/fill_form.modals.html | 249 +++++++++++++++ .../fill_form/modals/fill_form.modals.js | 230 ++++++++++++++ .../fill_form/templates/action.cell.html | 5 + .../record/bh-patient-medical-sheet.html | 21 ++ .../patients/record/patient-record.html | 9 + .../generate/dataKit/dataKit.config.js | 133 ++++++++ .../reports/generate/dataKit/dataKit.html | 116 +++++++ client/src/modules/reports/reports.routes.js | 1 + .../modals/survey_form.modals.html | 61 +++- .../survey_form/modals/survey_form.modals.js | 4 + client/src/modules/survey_form/survey_form.js | 48 +-- .../bhChoiceListMultipleSelect.tmpl.html | 31 ++ .../templates/bhSurveyFormSelect.tmpl.html | 6 +- server/config/routes.js | 15 + server/controllers/admin/displayMetadata.js | 256 +++++++++++++++ server/controllers/admin/fillFormsData.js | 299 ++++++++++++++++++ .../controllers/admin/metadataReport/index.js | 228 +++++++++++++ .../metadataReport/metadataReport.handlebars | 70 ++++ .../metadataReport/metadatacard.handlebars | 67 ++++ server/controllers/admin/surveyForm.js | 25 +- server/lib/template/helpers/logic.js | 23 ++ server/lib/template/index.js | 2 + server/models/bhima.sql | 77 +---- server/models/schema.sql | 56 ++++ .../displayMetadata/displayMetadata.page.js | 50 +++ .../displayMetadata/displayMetadata.spec.js | 37 +++ .../displayMetadata/searchModal.page.js | 20 ++ test/end-to-end/fillForm/fillForm.page.js | 68 ++++ test/end-to-end/fillForm/fillForm.spec.js | 39 +++ test/end-to-end/patient/record.spec.js | 21 +- .../shared/components/bhSurveyFormSelect.js | 17 + test/end-to-end/shared/components/index.js | 1 + test/integration/dataCollectorManagement.js | 2 +- test/integration/fillForm.js | 144 +++++++++ test/integration/surveyForm.js | 9 +- 61 files changed, 3656 insertions(+), 126 deletions(-) create mode 100644 client/src/js/components/bhChoiceListMultipleSelect.js create mode 100644 client/src/js/components/bhPatientMedicalSheet.js create mode 100644 client/src/js/components/bhSurveyFormSelect.js create mode 100644 client/src/modules/display_metadata/display_metadata.html create mode 100644 client/src/modules/display_metadata/display_metadata.js create mode 100644 client/src/modules/display_metadata/display_metadata.routes.js create mode 100644 client/src/modules/display_metadata/display_metadata.service.js create mode 100644 client/src/modules/display_metadata/modals/search.modal.html create mode 100644 client/src/modules/display_metadata/modals/search.modal.js create mode 100644 client/src/modules/display_metadata/templates/action.cell.html create mode 100644 client/src/modules/display_metadata/templates/choice_filter.cell.html create mode 100644 client/src/modules/display_metadata/templates/date.cell.html create mode 100644 client/src/modules/display_metadata/templates/required.cell.html create mode 100644 client/src/modules/fill_form/fill_form.html create mode 100644 client/src/modules/fill_form/fill_form.js create mode 100644 client/src/modules/fill_form/fill_form.routes.js create mode 100644 client/src/modules/fill_form/fill_form.service.js create mode 100644 client/src/modules/fill_form/modals/fill_form.modals.html create mode 100644 client/src/modules/fill_form/modals/fill_form.modals.js create mode 100644 client/src/modules/fill_form/templates/action.cell.html create mode 100644 client/src/modules/patients/record/bh-patient-medical-sheet.html create mode 100644 client/src/modules/reports/generate/dataKit/dataKit.config.js create mode 100644 client/src/modules/reports/generate/dataKit/dataKit.html create mode 100644 client/src/modules/templates/bhChoiceListMultipleSelect.tmpl.html create mode 100644 server/controllers/admin/displayMetadata.js create mode 100644 server/controllers/admin/fillFormsData.js create mode 100644 server/controllers/admin/metadataReport/index.js create mode 100644 server/controllers/admin/metadataReport/metadataReport.handlebars create mode 100644 server/controllers/admin/metadataReport/metadatacard.handlebars create mode 100644 test/end-to-end/displayMetadata/displayMetadata.page.js create mode 100644 test/end-to-end/displayMetadata/displayMetadata.spec.js create mode 100644 test/end-to-end/displayMetadata/searchModal.page.js create mode 100644 test/end-to-end/fillForm/fillForm.page.js create mode 100644 test/end-to-end/fillForm/fillForm.spec.js create mode 100644 test/end-to-end/shared/components/bhSurveyFormSelect.js create mode 100644 test/integration/fillForm.js diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index e02c1b2fce..bff1b04ff4 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -26,12 +26,14 @@ "DELETE_RECORD": "Delete Record", "DEPOT_MANAGEMENT": "Depots Management", "DISMISS": "Dismiss", + "DISPLAY_DATA": "Display Data", "EDIT": "Edit", "EDIT_PERMISSIONS": "Permission", "ENTER_FULL_DATE": "Enter Full Date", "ENTITY": "Entity", "EXPORT": "Export", "EXPORT_AS_EXCEL" : "Export data as MS Excel", + "FILL_FORM": "Fill the form", "FILTER": "Filter", "GROUP_BY_ACCOUNT": "Group by Account", "GROUP_BY_TRANSACTION": "Group By Transaction", @@ -212,6 +214,7 @@ "PAYMENT": "Cash Payment", "PREVIOUS": "Previous", "RECORD_SAME":"No changes have been made to the form", + "RESULT_FOUND": "Result found", "ROWS": "Rows", "SALE_DETAILS": "Sale Details", "SAVE_SUCCESS": "Save success", @@ -513,6 +516,7 @@ "MAX_CREDIT": "Max Credit", "MAX_CREDIT_INFO": "The maximum credit value this debtor group can collect before being warned. A value of 0 means no maximum limit.", "MEDICAL_NONMEDICAL_STAFF": "Medical and Non-Medical Staff", + "MEDICAL_SHEETS": "Medical Sheets", "MEDICAL_STAFF": "Medical Staff", "MEMBERSHIP_FEE": "Membership fees", "MIDDLE_NAME": "Middle Name", @@ -599,6 +603,7 @@ "PROFIT_CENTER": "Profit Center", "PROJECT": "Project", "PROVINCE": "Province", + "RANK": "Rank", "RATE": "Rate", "RUBRICS": "rubrics", "RECIPIENT": "Recipient", @@ -660,6 +665,7 @@ "TEL": "TEL", "TELEPHONE": "Telephone", "TEXT": "Text", + "TEXT_AREA": "Text area", "THIS_MONTH": "This Month", "THIS_WEEK": "This Week", "THIS_YEAR": "This Year", diff --git a/client/src/i18n/en/table.json b/client/src/i18n/en/table.json index 4606ea84e6..faa24f87e7 100644 --- a/client/src/i18n/en/table.json +++ b/client/src/i18n/en/table.json @@ -50,6 +50,7 @@ "CLIENT": "Client", "CODE": "Code", "CONTRIBUTION_DEDUCTIONS": "Contributions and deductions", + "CONSULT": "Consult", "COST": "Cost", "COST_CENTER": "Cost Center", "COST_CENTER_OPERATIONS": "Cost Center Operations", diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index 0f20938537..2894325f9b 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -29,13 +29,16 @@ "CREDIT_NOTE" : "Credit Note", "CREDITOR_GROUP" : "Creditor Group Management", "CURRENCY" : "Currency", + "DATA_COLLECTION": "Data Collection", "DATA_COLLECTOR_MANAGEMENT": "Data Collector Management", "DATA_KIT": "Data collection kit", + "DATA_KIT_REPORT": "Data Collection Kit Report", "DEPARTMENT_MANAGEMENT" : "Department Management", "DEBTOR_GROUP" : "Debtor Group Management", "DEPOTS" : "Depots", "DEPOTS_REGISTRY" : "Depots Registry", "DITRIBUTION_AUX_FEES_CENTERS" : "Distribution of Auxiliary Fee Centers", + "DISPLAY_METADATA": "Display Metadata", "DISTRIBUTION_KEYS": "Distribution Keys Management", "EMPLOYEE" : "Employee", "EMPLOYEE_REGISTRY" : "Employee Registry", @@ -45,6 +48,7 @@ "FEE_CENTER": "Fee Centers", "FEE_CENTER_MANAGEMENT": "Fee Center Management", "FEE_CENTER_REPORT": "Fee Center Report", + "FILL_FORM": "Fill Form", "FINANCE" : "Finance", "FISCAL_YEAR" : "Fiscal Year", "FUNCTION_BONUS_MANAGEMENT":"Function bonus management", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 4cb9abda5c..bd036e6f1b 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -26,12 +26,14 @@ "DELETE_RECORD": "Supprimer Enregistrement", "DEPOT_MANAGEMENT": "Gestion des dépôts", "DISMISS": "Rejeter", + "DISPLAY_DATA": "Afficher les données", "EDIT": "Éditer", "EDIT_PERMISSIONS": "Éditer permission", "ENTER_FULL_DATE": "Entrer la date complète", "ENTITY": "Entité", "EXPORT": "Exporter", "EXPORT_AS_EXCEL" : "Exporter au format Excel", + "FILL_FORM": "Remplir le formulaire", "FILTER": "Filtre", "GENERATE": "Générer", "GROUP_BY_ACCOUNT": "Grouper Par Compte", @@ -212,6 +214,7 @@ "PAYMENT": "Référence du Paiement", "PREVIOUS": "Précédent", "RECORD_SAME":"Aucun changement n'a été apporté sur le formulaire", + "RESULT_FOUND": "Résultat trouvé", "ROWS": "enregistrements", "SALE_DETAILS": "Détaille de la Facture", "SAVE_SUCCESS": "Enregistrement avec succès", @@ -515,6 +518,7 @@ "MAX_CREDIT": "Crédit Max", "MAX_CREDIT_INFO": "La valeur de crédit maximum de ce Groupe Débiteur peut recueillir avant d'être mis en garde. Une valeur de 0 signifie aucune limite maximale.", "MEDICAL_NONMEDICAL_STAFF": "Employés médicaux et non médicaux", + "MEDICAL_SHEETS": "Fiches Médicales", "MEDICAL_STAFF": "Personnel médical", "MEMBERSHIP_FEE": "Cotisations", "MIDDLE_NAME": "Post-nom", @@ -605,6 +609,7 @@ "PROVINCE": "Province", "PURCHASE_INTERVAL": "Intervalle de commande", "QUANTITY": "Quantité", + "RANK": "Rang", "RATE": "TAUX", "RUBRICS": "rubriques", "RECIPIENT": "Facture de ", @@ -668,6 +673,7 @@ "TEL": "Tél", "TELEPHONE": "Téléphone", "TEXT": "Texte", + "TEXT_AREA": "Zone de texte", "THIRD_EXPENSE_ACCOUNT": "Comptes de tiers/ Comptes de charges", "THIS_MONTH": "Ce Mois", "THIS_WEEK": "Cette Semaine", diff --git a/client/src/i18n/fr/table.json b/client/src/i18n/fr/table.json index b5e2cfa80a..bc18200ffd 100644 --- a/client/src/i18n/fr/table.json +++ b/client/src/i18n/fr/table.json @@ -50,6 +50,7 @@ "CLIENT": "Client", "CODE": "Code", "CONTRIBUTION_DEDUCTIONS": "Contributions et retenues", + "CONSULT": "Consulter", "COST": "Coût", "COST_CENTER": "Centre de coût", "COST_CENTER_OPERATIONS": "Exploitation par centre de coûts", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index ac36fd9228..0dfdea0926 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -29,13 +29,16 @@ "CREDIT_NOTE":"Note de Crédit", "CREDITOR_GROUP":"Gestion des Groupes Créditeurs", "CURRENCY":"Monnaie", + "DATA_COLLECTION": "Collecte de données", "DATA_COLLECTOR_MANAGEMENT": "Gestion des collecteurs de données", "DATA_KIT": "Kit de collecte de données", + "DATA_KIT_REPORT": "Rapport des collectes des données", "DEPARTMENT_MANAGEMENT" : "Gestion des Departements", "DEBTOR_GROUP":"Gestion des Groupes Débiteurs", "DEPOTS":"Dépôts", "DEPOTS_REGISTRY":"Registre des dépôts", "DITRIBUTION_AUX_FEES_CENTERS" : "Répartitions des centres de frais auxiliaires", + "DISPLAY_METADATA": "Afficher les métadonnées", "DISTRIBUTION_KEYS": "Gestion des clés de répartitions", "EMPLOYEE":"Gestion des Employés", "EMPLOYEE_REGISTRY" : "Registre des employés", @@ -45,6 +48,7 @@ "FEE_CENTER": "Centres de Frais", "FEE_CENTER_MANAGEMENT": "Gestion des centres de frais", "FEE_CENTER_REPORT": "Rapport des centres de frais", + "FILL_FORM": "Remplir le formulaire", "FINANCE":"Finances", "FISCAL_YEAR":"Année Fiscale", "FUNCTION_BONUS_MANAGEMENT":"Gestion des primes sur la responsabilté", diff --git a/client/src/js/components/bhChoiceListMultipleSelect.js b/client/src/js/components/bhChoiceListMultipleSelect.js new file mode 100644 index 0000000000..f695147a0e --- /dev/null +++ b/client/src/js/components/bhChoiceListMultipleSelect.js @@ -0,0 +1,56 @@ +angular.module('bhima.components') + .component('bhChoiceListMultipleSelect', { + templateUrl : 'modules/templates/bhChoiceListMultipleSelect.tmpl.html', + controller : ChoiceListMultipleSelectController, + bindings : { + onChange : '&', + lists : ' { + $ctrl.elements = elements; + }) + .catch(Notify.handleError); + + }; + + $ctrl.$onChanges = (changes) => { + if (changes.lists.currentValue) { + $ctrl.selectedLists = changes.lists.currentValue; + } + }; + + // fires the onSelectCallback bound to the component + $ctrl.handleChange = lists => $ctrl.onChange({ lists }); +} diff --git a/client/src/js/components/bhPatientMedicalSheet.js b/client/src/js/components/bhPatientMedicalSheet.js new file mode 100644 index 0000000000..323e5def4c --- /dev/null +++ b/client/src/js/components/bhPatientMedicalSheet.js @@ -0,0 +1,108 @@ +angular.module('bhima.components') + .component('bhPatientMedicalSheet', { + controller : PatientMedicalSheetCtrl, + templateUrl : 'modules/patients/record/bh-patient-medical-sheet.html', + bindings : { + patientUuid : '<', + }, + }); + +PatientMedicalSheetCtrl.$inject = [ + 'DataCollectorManagementService', 'NotifyService', 'uiGridConstants', '$state', +]; + +/** + * @function PatientMedicalSheetCtrl + * + * @description + * This component is allows + * to display the different medical sheet to record the Patients Medical Data + */ +function PatientMedicalSheetCtrl(DataCollectorManagement, Notify, uiGridConstants, $state) { + const $ctrl = this; + + this.$onInit = () => { + $ctrl.gridApi = {}; + $ctrl.filterEnabled = false; + $ctrl.toggleFilter = toggleFilter; + $ctrl.consult = consult; + + // options for the UI grid + $ctrl.gridOptions = { + appScopeProvider : $ctrl, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + enableSorting : true, + onRegisterApi : onRegisterApiFn, + columnDefs : [ + { + field : 'label', + width : 300, + displayName : 'FORM.LABELS.DESIGNATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'description', + displayName : 'FORM.LABELS.DETAILS', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'version_number', + displayName : 'FORM.LABELS.VERSION', + width : 100, + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'action', + displayName : '', + width : 100, + enableFiltering : 'false', + cellTemplate : '/modules/data_collector_management/templates/consultation.cell.html', + }, + ], + }; + + function onRegisterApiFn(gridApi) { + $ctrl.gridApi = gridApi; + } + + function toggleFilter() { + $ctrl.filterEnabled = !$ctrl.filterEnabled; + $ctrl.gridOptions.enableFiltering = $ctrl.filterEnabled; + $ctrl.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + function handleError(error) { + $ctrl.hasError = true; + Notify.handleError(error); + } + + // load user grid + function loadGrid() { + toggleLoadingIndicator(); + $ctrl.hasError = false; + $ctrl.loading = true; + + DataCollectorManagement.read(null, {is_related_patient : 1}) + .then((dataCollectorManagement) => { + $ctrl.gridOptions.data = dataCollectorManagement; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + + function toggleLoadingIndicator() { + $ctrl.loading = false; + } + + function consult(data) { + $state.go('display_metadata.patient', { id : data.id, patient : $ctrl.patientUuid }); + } + + loadGrid(); + }; +} diff --git a/client/src/js/components/bhSurveyFormSelect.js b/client/src/js/components/bhSurveyFormSelect.js new file mode 100644 index 0000000000..611c8ecf1b --- /dev/null +++ b/client/src/js/components/bhSurveyFormSelect.js @@ -0,0 +1,44 @@ +angular.module('bhima.components') + .component('bhSurveyFormSelect', { + templateUrl : 'modules/templates/bhSurveyFormSelect.tmpl.html', + controller : SurveyFormSelectController, + transclude : true, + bindings : { + form : ' { + $ctrl.surveyForms = surveyForms; + }) + .catch(Notify.handleError); + }; + + // fires the onSelectCallback bound to the component boundary + $ctrl.onSelect = surveyForm => { + $ctrl.onSelectCallback({ surveyForm }); + }; +} diff --git a/client/src/js/services/receipts/ReceiptModal.js b/client/src/js/services/receipts/ReceiptModal.js index bf2a7b1ff7..f3c77b2213 100644 --- a/client/src/js/services/receipts/ReceiptModal.js +++ b/client/src/js/services/receipts/ReceiptModal.js @@ -35,6 +35,7 @@ function ReceiptModal(Modal, Receipts, Invoice, Cash, Voucher) { service.voucher = voucher; service.creditNote = creditNote; service.payrollReport = payrollReport; + service.displayData = displayData; /** * Invokes a patient invoice receipt @@ -296,6 +297,32 @@ function ReceiptModal(Modal, Receipts, Invoice, Cash, Voucher) { return instance.result; } + function displayData(dataUuid, patientData, notifyCreated) { + const options = { + title : 'TREE.DISPLAY_METADATA', + renderer : Receipts.renderer, + notifyCreated, + }; + + const request = { + dataUuid, + patient : patientData, + }; + + const displayDataRequest = Receipts.displayData(request, { renderer : options.renderer }); + const reportProvider = { + resolve : { + receipt : function receiptProvider() { return { promise : displayDataRequest }; }, + options : function optionsProvider() { return options; }, + document : function documentProvider() { return {}; }, + }, + }; + + const configuration = angular.extend(modalConfiguration, reportProvider); + const instance = Modal.open(configuration); + return instance.result; + } + // ================================ stock ===================================== // bind methods service.stockExitPatientReceipt = stockExitPatientReceipt; diff --git a/client/src/js/services/receipts/ReceiptService.js b/client/src/js/services/receipts/ReceiptService.js index 487299b626..9233e2c727 100644 --- a/client/src/js/services/receipts/ReceiptService.js +++ b/client/src/js/services/receipts/ReceiptService.js @@ -50,6 +50,7 @@ function ReceiptService($http, util, Language, AppCache, Session) { service.setReceiptCurrency = setReceiptCurrency; service.setReceiptRenderer = setReceiptRenderer; service.payrollReport = payrollReport; + service.displayData = displayData; /** * @method fetch @@ -157,6 +158,16 @@ function ReceiptService($http, util, Language, AppCache, Session) { return fetch(route, options); } + // print metadata of survey + function displayData(request, options) { + options.uuid = request.dataUuid; + options.patient = request.patient; + // set the session language + options.lang = Language.key; + const route = '/display_metadata/card'; + return fetch(route, options); + } + // ========================== stock ============================== // bind methods diff --git a/client/src/modules/data_collector_management/templates/consultation.cell.html b/client/src/modules/data_collector_management/templates/consultation.cell.html index a8fd6d63fc..70bd2e7639 100644 --- a/client/src/modules/data_collector_management/templates/consultation.cell.html +++ b/client/src/modules/data_collector_management/templates/consultation.cell.html @@ -1,20 +1,5 @@ -
- - FORM.BUTTONS.ACTIONS - +
+ + TABLE.COLUMNS.CONSULT - -
diff --git a/client/src/modules/display_metadata/display_metadata.html b/client/src/modules/display_metadata/display_metadata.html new file mode 100644 index 0000000000..3ad216c951 --- /dev/null +++ b/client/src/modules/display_metadata/display_metadata.html @@ -0,0 +1,121 @@ +
+
+
    +
  1. TREE.DATA_COLLECTION
    2. +
  2. TREE.DISPLAY_METADATA
    3. +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+ + +
+ + + {{ DisplayMetadataCtrl.collector.label }} + + + + + + + {{ DisplayMetadataCtrl.filterElements }} + + + + + + + + + :{{ DisplayMetadataCtrl.patient.display_name }} / {{ DisplayMetadataCtrl.patient.reference}} + + +
+ +
+
+
+ + + +
+
+
diff --git a/client/src/modules/display_metadata/display_metadata.js b/client/src/modules/display_metadata/display_metadata.js new file mode 100644 index 0000000000..776ed18ccd --- /dev/null +++ b/client/src/modules/display_metadata/display_metadata.js @@ -0,0 +1,208 @@ +angular.module('bhima.controllers') + .controller('DisplayMetadataController', DisplayMetadataController); + +DisplayMetadataController.$inject = [ + '$state', 'DisplayMetadataService', 'DataCollectorManagementService', 'NotifyService', + 'uiGridConstants', 'ModalService', 'PatientService', 'util', 'AppCache', 'SurveyFormService', 'ReceiptModal', + 'ChoicesListManagementService', +]; + +/** + * DISPLAY METADATA CONTROLLER + * This module is responsible for handling the CRUD operation on DISPLAY METADATA CONTROLLER + */ + +function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagement, + Notify, uiGridConstants, ModalService, Patients, util, AppCache, SurveyForm, Receipts, + ChoicesList) { + const vm = this; + vm.gridApi = {}; + vm.filterEnabled = false; + vm.toggleFilter = toggleFilter; + vm.format = util.formatDate; + vm.search = search; + vm.collector = {}; + vm.changes = {}; + vm.onRemove = onRemove; + vm.displayData = displayData; + vm.download = DisplayMetadata.download; + + const cache = new AppCache('display_metadata'); + + ChoicesList.read() + .then(choicesLists => { + vm.choicesLists = choicesLists; + }) + .catch(Notify.handleError); + + if ($state.params.id && $state.params.patient) { + // Prevent a non-patient form from being used to collect non-patient data + vm.patientData = true; + } else { + vm.patientData = false; + + if (vm.collectorId) { + loadGrid(); + } + } + + // options for the UI grid + vm.gridOptions = { + appScopeProvider : vm, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + enableSorting : true, + showColumnFooter : true, + onRegisterApi : onRegisterApiFn, + enableHorizontalScrollbar : uiGridConstants.scrollbars.WHEN_NEEDED, + }; + + function onRegisterApiFn(gridApi) { + vm.gridApi = gridApi; + } + + function toggleFilter() { + vm.filterEnabled = !vm.filterEnabled; + vm.gridOptions.enableFiltering = vm.filterEnabled; + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + // bind methods + vm.edit = edit; + vm.remove = remove; + + function edit(data) { + if (!$state.params.patient) { + $state.go('display_metadata.edit', { id : data.data_collector_management_id, uuid : data.uuid }); + } else if ($state.params.patient) { + $state.go('display_metadata.patientEdit', { + id : data.data_collector_management_id, + uuid : data.uuid, + patient : $state.params.patient, + }); + } + } + + function remove(uuid) { + ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') + .then(() => { + DisplayMetadata.delete(uuid) + .then(() => { + Notify.success('FORM.INFO.DELETE_SUCCESS'); + loadGrid(); + }) + .catch(Notify.handleError); + }); + } + + function handleError(error) { + vm.hasError = true; + Notify.handleError(error); + } + + // load user grid + function loadGrid() { + toggleLoadingIndicator(); + // Reuse cash unless patient data is consulted + if (cache.collector && !vm.collectorId && !$state.params.patient) { + vm.collectorId = cache.collector.id; + } + const changesLength = Object.keys(vm.changes).length; + + if (cache.changes && !changesLength) { + vm.changes = cache.changes; + } + + if (!$state.params.id && !vm.collectorId) { + search(); + } else if (vm.collectorId && !$state.params.id) { + vm.hasError = false; + vm.loading = true; + + SurveyForm.read(null, { data_collector_management_id : vm.collectorId }) + .then((survey) => { + vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + + vm.params = { + data_collector_management_id : vm.collectorId, + changes : vm.changes, + }; + + return DisplayMetadata.read(null, vm.params); + }) + .then((data) => { + vm.gridOptions.columnDefs = data.columns; + vm.gridOptions.data = data.surveyData; + + return DataCollectorManagement.read(vm.collectorId); + }) + .then((collector) => { + cache.collector = collector; + cache.changes = vm.changes; + vm.collector = collector; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + + } else if ($state.params.id && $state.params.patient) { + vm.hasError = false; + vm.loading = true; + vm.collectorId = $state.params.id; + // View Patient Form Data + vm.params = { + data_collector_management_id : $state.params.id, + patient_uuid : $state.params.patient, + changes : vm.changes, + }; + + DisplayMetadata.read(null, vm.params) + .then((data) => { + vm.gridOptions.columnDefs = data.columns; + vm.gridOptions.data = data.surveyData; + + return Patients.read($state.params.patient); + }) + .then((patient) => { + vm.patient = patient; + return DataCollectorManagement.read($state.params.id); + }) + .then((collector) => { + vm.collector = collector; + return SurveyForm.read(null, { data_collector_management_id : vm.collectorId }); + }) + .then((survey) => { + vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + } + + function toggleLoadingIndicator() { + vm.loading = false; + } + + // search Payroll Data + function search() { + DisplayMetadata.openSearchModal() + .then((changes) => { + vm.collectorId = changes.collectorId; + vm.changes = changes; + loadGrid(); + }); + } + + // On Remove all filter; + function onRemove() { + vm.changes = {}; + cache.changes = {}; + loadGrid(); + } + + function displayData(dataUuid) { + Receipts.displayData(dataUuid, vm.patient, true); + } + + loadGrid(); +} diff --git a/client/src/modules/display_metadata/display_metadata.routes.js b/client/src/modules/display_metadata/display_metadata.routes.js new file mode 100644 index 0000000000..cd04006eef --- /dev/null +++ b/client/src/modules/display_metadata/display_metadata.routes.js @@ -0,0 +1,58 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('display_metadata', { + url : '/display_metadata', + controller : 'DisplayMetadataController as DisplayMetadataCtrl', + templateUrl : 'modules/display_metadata/display_metadata.html', + }) + + .state('display_metadata.patient', { + url : '/:id/:patient/patient', + controller : 'DisplayMetadataController as DisplayMetadataCtrl', + templateUrl : 'modules/display_metadata/display_metadata.html', + }) + + .state('display_metadata.patientfill', { + url : '/:id/:patient/fill', + params : { + fill_form : { value : null }, + creating : { value : true }, + }, + onEnter : ['$uibModal', fillFormModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('display_metadata.patientEdit', { + url : '/:id/:uuid/:patient/edit', + params : { + fill_form : { value : null }, + creating : { value : true }, + }, + onEnter : ['$uibModal', fillFormModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('display_metadata.edit', { + url : '/:id/:uuid/edit', + params : { + fill_form : { value : null }, + creating : { value : false }, + }, + onEnter : ['$uibModal', fillFormModal], + onExit : ['$uibModalStack', closeModal], + }); + }]); + +function fillFormModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/fill_form/modals/fill_form.modals.html', + controller : 'FillFormModalController as FillFormModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/display_metadata/display_metadata.service.js b/client/src/modules/display_metadata/display_metadata.service.js new file mode 100644 index 0000000000..ee82796b48 --- /dev/null +++ b/client/src/modules/display_metadata/display_metadata.service.js @@ -0,0 +1,116 @@ +angular.module('bhima.services') + .service('DisplayMetadataService', DisplayMetadataService); + +DisplayMetadataService.$inject = ['PrototypeApiService', '$uibModal', 'moment', + '$translate', '$httpParamSerializer', 'LanguageService']; + +/** + * @class DisplayMetadataService + * @extends PrototypeApiService + * + * @description + * Encapsulates common requests to the /display_metadata/ URL. + */ +function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerializer, Languages) { + const service = new Api('/display_metadata/'); + service.listSurveyformtype = listSurveyformtype; + service.openSearchModal = openSearchModal; + service.displayFilters = displayFilters; + service.download = download; + + function download(type, changes, id, filterClient, patientUuid, patient) { + const options = { + renderer : type, + changes, + lang : Languages.key, + patient_uuid : patientUuid || null, + downloadMode : true, + data_collector_management_id : id, + filterClient, + patient, + }; + + // return serialized options + return $httpParamSerializer(options); + } + + function listSurveyformtype() { + const url = ''.concat('listSurveyformtype'); + return Api.read.call(service, url); + } + + /** + * @function openSearchModal + * @description + * This functions opens the search modal form for Display Metadata registry. + */ + function openSearchModal(filters) { + return Modal.open({ + templateUrl : 'modules/display_metadata/modals/search.modal.html', + size : 'md', + animation : false, + keyboard : false, + backdrop : 'static', + controller : 'DisplayMetadataSearchModalController as $ctrl', + resolve : { + filters : function filtersProvider() { return filters; }, + }, + }).result; + } + + function displayFilters(survey, search) { + let filters = ``; + const dateLabel = $translate.instant('FORM.LABELS.DATE'); + + if (search.searchDateFrom) { + const dateFromLength = Object.keys(search.searchDateFrom).length; + if (dateFromLength) { + Object.keys(search.searchDateFrom).forEach((key) => { + if (key === 'dateSurvey') { + filters += ` // ( ${dateLabel} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} + - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`; + } + + survey.forEach(item => { + if (item.name === key) { + filters += ` // ( ${item.label} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} + - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`; + } + }); + }); + } + } + + if (search.loggedChanges) { + search.loggedChanges.forEach(element => { + survey.forEach(item => { + if (item.name === element.key) { + filters += ` // ${item.label} : ${element.value} `; + } + }); + }); + } + + if (search.multipleChoice) { + const multipleChoiceLength = Object.keys(search.multipleChoice).length; + if (multipleChoiceLength) { + Object.keys(search.multipleChoice).forEach((key) => { + survey.forEach(item => { + if (item.name === key) { + let multiChoice = ''; + for (let i = 0; i < search.multipleChoice[key].length; i++) { + multiChoice += ` ${search.multipleChoice[key][i]}, `; + } + + filters += ` // ${item.label} : ( ${multiChoice} )`; + } + }); + }); + } + } + + return filters; + } + + return service; +} diff --git a/client/src/modules/display_metadata/modals/search.modal.html b/client/src/modules/display_metadata/modals/search.modal.html new file mode 100644 index 0000000000..bf838168ae --- /dev/null +++ b/client/src/modules/display_metadata/modals/search.modal.html @@ -0,0 +1,109 @@ +
+
+
    +
  1. TREE.DATA_COLLECTION
    2. +
  2. TREE.DISPLAY_METADATA
    3. +
+
+ +
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+
+
+
+ +
+ + + +
+
+
+ +
+
+ +
+ + + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
+
+ +
+ + + + FORM.BUTTONS.SUBMIT + +
+
diff --git a/client/src/modules/display_metadata/modals/search.modal.js b/client/src/modules/display_metadata/modals/search.modal.js new file mode 100644 index 0000000000..48d93d95f9 --- /dev/null +++ b/client/src/modules/display_metadata/modals/search.modal.js @@ -0,0 +1,107 @@ +angular.module('bhima.controllers') + .controller('DisplayMetadataSearchModalController', DisplayMetadataSearchModalController); + +DisplayMetadataSearchModalController.$inject = [ + '$uibModalInstance', 'Store', 'SurveyFormService', 'NotifyService', 'AppCache', 'ChoicesListManagementService', +]; + +/** + * @class DisplayMetadataSearchModalController + * + * @description + * This controller is responsible to collecting data from the filter form and + * returning it as a JSON object to the parent controller. The data can be + * preset by passing in a filters object using filtersProvider(). + */ +function DisplayMetadataSearchModalController( + ModalInstance, Store, SurveyForm, Notify, AppCache, ChoicesList + // ModalInstance, filters, Notify, Store, util, + // MultiplePayroll, Currencies, Payroll, $translate, Session +) { + const vm = this; + vm.onSelectSurveyForm = onSelectSurveyForm; + vm.searchQueries = {}; + vm.searchDateFrom = {}; + vm.searchDateTo = {}; + vm.multipleChoice = {}; + vm.onSelectList = onSelectList; + vm.onSelectMultiple = onSelectMultiple; + + const cache = new AppCache('display_metadata'); + + if (Object.keys(cache).length) { + if (cache.collector.id) { + onSelectSurveyForm(cache.collector); + } + } + + function onSelectList(list, value) { + vm.searchQueries[value] = list.label; + } + + function onSelectMultiple(lists, value) { + vm.multipleChoice[value] = lists; + } + + function onSelectSurveyForm(collector) { + vm.searchQueries.data_collector_id = collector.id; + + SurveyForm.read(null, { data_collector_management_id : collector.id }) + .then(surveyElements => { + vm.formItems = surveyElements; + return ChoicesList.read(); + }) + .then(choicesLists => { + vm.choicsLists = choicesLists; + }) + .catch(Notify.handleError); + } + const changes = new Store({ identifier : 'key' }); + + const lastValues = {}; + + // displayValues will be an id:displayValue pair + const displayValues = {}; + + vm.cancel = function cancel() { ModalInstance.close(); }; + + // submit the filter object to the parent controller. + vm.submit = function submit(form) { + let _displayValue; + if (form.$invalid) { return 0; } + + // push all searchQuery values into the changes array to be applied + angular.forEach(vm.searchQueries, (_value, _key) => { + if (angular.isDefined(_value)) { + + // default to the original value if no display value is defined + _displayValue = displayValues[_key] || lastValues[_key]; + changes.post({ key : _key, value : _value, displayValue : _displayValue }); + } + }); + + const multipleChoiceLength = Object.keys(vm.multipleChoice).length; + if (multipleChoiceLength) { + Object.keys(vm.multipleChoice).forEach((key) => { + for (let i = 0; i < vm.multipleChoice[key].length; i++) { + vm.choicesLists.forEach(list => { + if (list.id === vm.multipleChoice[key][i]) { + vm.multipleChoice[key][i] = list.label; + } + }); + } + }); + } + + const allChanges = { + loggedChanges : changes.getAll(), + collectorId : vm.searchQueries.data_collector_id, + searchDateFrom : vm.searchDateFrom, + searchDateTo : vm.searchDateTo, + multipleChoice : vm.multipleChoice, + }; + + // return values to the controller + return ModalInstance.close(allChanges); + }; +} diff --git a/client/src/modules/display_metadata/templates/action.cell.html b/client/src/modules/display_metadata/templates/action.cell.html new file mode 100644 index 0000000000..c968a57f44 --- /dev/null +++ b/client/src/modules/display_metadata/templates/action.cell.html @@ -0,0 +1,33 @@ +
+ + FORM.BUTTONS.ACTIONS + + + + +
\ No newline at end of file diff --git a/client/src/modules/display_metadata/templates/choice_filter.cell.html b/client/src/modules/display_metadata/templates/choice_filter.cell.html new file mode 100644 index 0000000000..cb32090184 --- /dev/null +++ b/client/src/modules/display_metadata/templates/choice_filter.cell.html @@ -0,0 +1,6 @@ +
+ + + {{ row.entity.filterLabel }} + +
\ No newline at end of file diff --git a/client/src/modules/display_metadata/templates/date.cell.html b/client/src/modules/display_metadata/templates/date.cell.html new file mode 100644 index 0000000000..6a23a3fb5f --- /dev/null +++ b/client/src/modules/display_metadata/templates/date.cell.html @@ -0,0 +1,4 @@ +
+ {{ grid.appScope.format(row.entity.dateSurvey) }} + {{ grid.appScope.format(row.treeNode.children[0].row.entity.dateSurvey) }} +
\ No newline at end of file diff --git a/client/src/modules/display_metadata/templates/required.cell.html b/client/src/modules/display_metadata/templates/required.cell.html new file mode 100644 index 0000000000..c30486deff --- /dev/null +++ b/client/src/modules/display_metadata/templates/required.cell.html @@ -0,0 +1,4 @@ +
+ + +
\ No newline at end of file diff --git a/client/src/modules/fill_form/fill_form.html b/client/src/modules/fill_form/fill_form.html new file mode 100644 index 0000000000..cc01f657a9 --- /dev/null +++ b/client/src/modules/fill_form/fill_form.html @@ -0,0 +1,39 @@ +
+
+
    +
  1. TREE.DATA_COLLECTION
    2. +
  2. TREE.FILL_FORM
    3. +
+ +
+
+ +
+
+
+
+ + +
+
+
+ + + +
+
+
diff --git a/client/src/modules/fill_form/fill_form.js b/client/src/modules/fill_form/fill_form.js new file mode 100644 index 0000000000..5447e6892f --- /dev/null +++ b/client/src/modules/fill_form/fill_form.js @@ -0,0 +1,119 @@ +angular.module('bhima.controllers') + .controller('FillFormController', FillFormController); + +FillFormController.$inject = [ + '$state', 'DataCollectorManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', +]; + +/** + * Data Collector Management Controller + * This module is responsible for handling the CRUD operation on Data Collector Management + */ + +function FillFormController($state, DataCollectorManagement, Notify, uiGridConstants, ModalService) { + const vm = this; + vm.gridApi = {}; + vm.filterEnabled = false; + vm.toggleFilter = toggleFilter; + + // options for the UI grid + vm.gridOptions = { + appScopeProvider : vm, + enableColumnMenus : false, + fastWatch : true, + flatEntityAccess : true, + enableSorting : true, + onRegisterApi : onRegisterApiFn, + columnDefs : [ + { + field : 'label', + width : 300, + displayName : 'FORM.LABELS.DESIGNATION', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'description', + displayName : 'FORM.LABELS.DETAILS', + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'version_number', + displayName : 'FORM.LABELS.VERSION', + width : 100, + enableFiltering : 'true', + headerCellFilter : 'translate', + }, + { + field : 'is_related_patient', + displayName : 'FORM.INFO.IS_RELATED_PATIENT', + width : 150, + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/data_collector_management/templates/is_related_patient.cell.html', + }, + { + field : 'action', + displayName : '', + width : 200, + enableFiltering : 'false', + cellTemplate : '/modules/fill_form/templates/action.cell.html', + }, + + ], + }; + function onRegisterApiFn(gridApi) { + vm.gridApi = gridApi; + } + + function toggleFilter() { + vm.filterEnabled = !vm.filterEnabled; + vm.gridOptions.enableFiltering = vm.filterEnabled; + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.COLUMN); + } + + // bind methods + vm.fill = fill; + vm.remove = remove; + + function fill(dataCollectorManagement) { + $state.go('fill_form.fill', { id : dataCollectorManagement.id }); + } + + function remove(id) { + ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE') + .then(() => { + DataCollectorManagement.delete(id) + .then(() => { + Notify.success('FORM.INFO.DELETE_SUCCESS'); + loadGrid(); + }) + .catch(Notify.handleError); + }); + } + function handleError(error) { + vm.hasError = true; + Notify.handleError(error); + } + + // load user grid + function loadGrid() { + toggleLoadingIndicator(); + vm.hasError = false; + vm.loading = true; + + DataCollectorManagement.read() + .then((dataCollectorManagement) => { + vm.gridOptions.data = dataCollectorManagement; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); + } + + function toggleLoadingIndicator() { + vm.loading = false; + } + + loadGrid(); +} diff --git a/client/src/modules/fill_form/fill_form.routes.js b/client/src/modules/fill_form/fill_form.routes.js new file mode 100644 index 0000000000..6ffd1eb137 --- /dev/null +++ b/client/src/modules/fill_form/fill_form.routes.js @@ -0,0 +1,43 @@ +angular.module('bhima.routes') + .config(['$stateProvider', $stateProvider => { + $stateProvider + .state('fill_form', { + url : '/fill_form', + controller : 'FillFormController as FillFormCtrl', + templateUrl : 'modules/fill_form/fill_form.html', + }) + + .state('fill_form.fill', { + url : '/:id/fill', + params : { + fill_form : { value : null }, + creating : { value : true }, + }, + onEnter : ['$uibModal', fillFormModal], + onExit : ['$uibModalStack', closeModal], + }) + + .state('fill_form.edit', { + url : '/:id/:uuid/edit', + params : { + fill_form : { value : null }, + creating : { value : false }, + }, + onEnter : ['$uibModal', fillFormModal], + onExit : ['$uibModalStack', closeModal], + }); + + }]); + +function fillFormModal($modal) { + $modal.open({ + keyboard : false, + backdrop : 'static', + templateUrl : 'modules/fill_form/modals/fill_form.modals.html', + controller : 'FillFormModalController as FillFormModalCtrl', + }); +} + +function closeModal(ModalStack) { + ModalStack.dismissAll(); +} diff --git a/client/src/modules/fill_form/fill_form.service.js b/client/src/modules/fill_form/fill_form.service.js new file mode 100644 index 0000000000..5cd2424242 --- /dev/null +++ b/client/src/modules/fill_form/fill_form.service.js @@ -0,0 +1,86 @@ +angular.module('bhima.services') + .service('FillFormService', FillFormService); + +FillFormService.$inject = ['PrototypeApiService']; + +/** + * @class FillFormService + * @extends PrototypeApiService + * + * @description + * Encapsulates common requests to the /fill_form/ URL. + */ +function FillFormService(Api) { + const service = new Api('/fill_form/'); + + service.formatData = formatData; + service.restoreImage = restoreImage; + service.formatConstraint = formatConstraint; + + function formatData(form, data) { + const dataSurveyForm = {}; + // Ici l'on verifie les occurences des donnees existantes + // S'il sont multiples afin de les affecter dans des tableaux + form.forEach(f => { + data.forEach(d => { + if ((f.id === d.survey_form_id) && (f.type === '4')) { + dataSurveyForm[f.name] = []; + } + }); + }); + + form.forEach(f => { + data.forEach(d => { + // Pour les identifiants des listes des choix, + // il est primordiale de le transormer en Integer + if ((f.id === d.survey_form_id) && (f.type === '4')) { + // Multiple choice list management + dataSurveyForm[f.name].push(parseInt(d.value, 10)); + } else if ((f.id === d.survey_form_id) && (f.type !== '4') && (f.type !== '7')) { + // Single choice list management + d.value = (f.type === '1') ? parseFloat(d.value) : d.value; + d.value = (f.type === '3') ? parseInt(d.value, 10) : d.value; + + // format date + d.value = (f.type === '6') ? new Date(d.value) : d.value; + dataSurveyForm[f.name] = d.value; + } else if ((f.id === d.survey_form_id) && (f.type === '7')) { + + // format time + const newDate = new Date(); + const timeSplit = d.value.split(':'); + dataSurveyForm[f.name] = newDate.setHours(timeSplit[0], timeSplit[1]); + } + }); + }); + + return dataSurveyForm; + } + + function restoreImage(data) { + return service.$http.post(`/fill_form/restoreImage`, { data }) + .then(service.util.unwrapHttpResponse); + } + + /* + * This function is used to format the value of the constraint + * to a valid angular expression, the value encapsulate in. {} Must be transformed into + * FillFormModalCtrl.form. and if the eval function + * is incorrectly evaluates the return function a null value + */ + + function formatConstraint(constraint) { + // valueA format the constaint for input type text and number + let valueA = constraint.replace(/.{/g, 'FillFormModalCtrl.form.'); + valueA = valueA.replace(/}/g, ''); + + // valueB format the contraint for input type select one + let valueB = constraint.replace(/.{/g, 'FillFormModalCtrl.containtValue.'); + valueB = valueB.replace(/}/g, ''); + + return `(${valueA}) || (${valueB})` || null; + + } + + return service; +} diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html new file mode 100644 index 0000000000..6128c04f65 --- /dev/null +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -0,0 +1,249 @@ +
+
+
    +
  1. TREE.DATA_COLLECTION
    2. + +
  2. + TREE.SURVEY_FORM +
    3. +
+
+ +
+

+ + {{ FillFormModalCtrl.dataCollector.label }} + +

+

{{ FillFormModalCtrl.patient.display_name }} / {{ FillFormModalCtrl.patient.reference}}

+
+ +
+
+ +
+ +
+ + {{ formItem.hint }} +
+ + + + + + + +
+
+
+
+
+ + +
+ + {{ formItem.hint }} +
+ + + + + + +
+
+
+
+
+ + +
+ {{ formItem.hint }} + + +
+ + +
+ {{ formItem.label }} : {{ formItem.calculation }} +
:{{ FillFormModalCtrl.form[formItem.name] }}
+
+ + +
+ + {{ formItem.hint }} +
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+ + {{ formItem.label }} + +
+
+
+ + + +
+
+ + {{ formItem.hint }} + +
+ + +
+ +
+
+ + +
+ {{ formItem.hint }} + + + + + + + + + +
+ + +
+ {{ formItem.hint }} + + +
+ + +
+ {{ formItem.hint }} +
+ +
+ + +
+
+
+
+ +
+

+ FORM.INFO.NO_CHANGE +

+ +

+ FORM.ERRORS.GENERIC +

+ + + + + FORM.BUTTONS.SUBMIT + +
+
diff --git a/client/src/modules/fill_form/modals/fill_form.modals.js b/client/src/modules/fill_form/modals/fill_form.modals.js new file mode 100644 index 0000000000..3528a607a2 --- /dev/null +++ b/client/src/modules/fill_form/modals/fill_form.modals.js @@ -0,0 +1,230 @@ +angular.module('bhima.controllers') + .controller('FillFormModalController', FillFormModalController); + +FillFormModalController.$inject = [ + '$state', 'FillFormService', 'NotifyService', 'appcache', 'SurveyFormService', + 'DataCollectorManagementService', 'Upload', 'PatientService', +]; + +/** + * FILL FORM Modal Controller + */ + +function FillFormModalController($state, FillForm, Notify, AppCache, + SurveyForm, DataCollectorManagement, Upload, Patients) { + const vm = this; + const cache = AppCache('FillFormModalController'); + + vm.stateParams = {}; + // exposed methods + vm.submit = submit; + vm.closeModal = closeModal; + vm.clear = clear; + vm.form = {}; + vm.dataCollector = {}; + vm.onSelectList = onSelectList; + vm.onDateChange = onDateChange; + vm.onTimeChange = onTimeChange; + vm.onSelectMultiple = onSelectMultiple; + vm.setThumbnail = setThumbnail; + vm.picture = {}; + vm.updateMode = false; + vm.containtValue = {}; + + if ($state.params.creating || $state.params.id) { + cache.stateParams = $state.params; + vm.stateParams = cache.stateParams; + } else { + vm.stateParams = cache.stateParams; + } + + function onSelectList(list, value) { + vm.form[value] = list.id; + vm.containtValue[value] = list.label; + } + + function onSelectMultiple(lists, value) { + vm.form[value] = lists; + } + + function onDateChange(date, value) { + vm.form[value] = new Date(date); + } + + function onTimeChange(time) { + const timeForm = new Date(vm.form[time]); + vm.form[time] = timeForm.getHours(); + } + + function uploadImage(file, uuid, key) { + file.upload = Upload.upload({ + url : `/fill_form/${uuid}/${key}/image`, + data : { image : file }, + }); + + return file.upload + .then(() => { + }) + .catch((error) => { + Notify.handleError(error); + }); + } + + function restoreImage(file, old, uuid, key) { + const dataImage = { + file, + old, + uuid, + key, + }; + + return FillForm.restoreImage(dataImage); + } + + /** set thumbnail for the selected image */ + function setThumbnail(file, formName) { + if (!file) { + vm.documentError = true; + return; + } + const isImage = file.type.includes('image/'); + vm.picture[formName] = file; + vm.hasThumbnail = (vm.picture[formName] && isImage); + } + + if (vm.stateParams.patient) { + Patients.read($state.params.patient) + .then((patient) => { + vm.patient = patient; + }) + .catch(Notify.handleError); + } + + if (vm.stateParams.id && !vm.stateParams.uuid) { + SurveyForm.read(null, { data_collector_management_id : vm.stateParams.id }) + .then(data => { + data.forEach(item => { + item.valueRequired = item.required ? 'required' : ''; + + if (item.default) { + vm.form[item.name] = (item.type === '1') + ? parseInt(item.default, 10) : item.default; + } + + if (item.calculation) { + vm.form[item.name] = item.calculation; + } + + if (item.constraint) { + item.constraintCheck = FillForm.formatConstraint(item.constraint); + } + + }); + vm.formItems = data; + + return DataCollectorManagement.read(vm.stateParams.id); + }) + .then(dataCollector => { + vm.dataCollector = dataCollector; + }) + .catch(Notify.handleError); + } else if (vm.stateParams.id && vm.stateParams.uuid) { + vm.updateMode = true; + SurveyForm.read(null, { data_collector_management_id : vm.stateParams.id }) + .then(data => { + data.forEach(item => { + item.valueRequired = item.required ? 'required' : ''; + if (item.default) { + vm.form[item.name] = (item.type === '1') + ? parseInt(item.default, 10) : item.default; + } + + if (item.calculation) { + vm.form[item.name] = item.calculation; + } + + if (item.constraint) { + item.constraintCheck = FillForm.formatConstraint(item.constraint); + } + + }); + vm.formItems = data; + + return DataCollectorManagement.read(vm.stateParams.id); + }) + .then(dataCollector => { + vm.dataCollector = dataCollector; + return FillForm.read(vm.stateParams.uuid); + }) + .then(dataSurvey => { + vm.form = FillForm.formatData(vm.formItems, dataSurvey); + vm.oldData = FillForm.formatData(vm.formItems, dataSurvey); + }) + .catch(Notify.handleError); + + } + + // submit the data to the server from all two forms (update, create) + function submit(fillForm) { + vm.hasNoChange = fillForm.$submitted && fillForm.$pristine && !vm.isCreating; + if (fillForm.$invalid) { return null; } + if (!fillForm.$dirty) { return null; } + + vm.form.data_collector_management_id = vm.stateParams.id; + if (vm.stateParams.patient) { + vm.form.patient_uuid = vm.stateParams.patient; + } + + const dataUpdate = { + old : vm.oldData, + new : vm.form, + }; + + const promise = (vm.updateMode) + ? FillForm.update(vm.stateParams.uuid, dataUpdate) : FillForm.create(vm.form); + + return promise + .then((res) => { + Object.keys(vm.form).forEach((key) => { + vm.formItems.forEach(item => { + if ((key === item.name) && (item.typeForm === 'image')) { + if (!vm.updateMode) { + uploadImage(vm.form[key], res.uuid, item.id); + } else if (vm.updateMode) { + if (vm.form[key] === vm.oldData[key]) { + restoreImage(vm.form[key], vm.oldData[key], res.uuid, item.id); + } else { + uploadImage(vm.form[key], res.uuid, item.id); + } + } + } + }); + }); + const translateKey = (vm.updateMode) ? 'FORM.INFO.UPDATE_SUCCESS' : 'FORM.INFO.CREATE_SUCCESS'; + Notify.success(translateKey); + + if (!vm.stateParams.patient && !vm.updateMode) { + $state.go('fill_form', null, { reload : true }); + } else if (!vm.stateParams.patient && vm.updateMode) { + $state.go('display_metadata', { id : vm.stateParams.id }, { reload : true }); + } else if (vm.stateParams.patient) { + $state.go('display_metadata.patient', + { id : vm.stateParams.id, patient : vm.stateParams.patient }, { reload : true }); + } + }) + .catch(Notify.handleError); + } + + function clear(value) { + delete vm.form[value]; + } + + function closeModal() { + const transitionTo = vm.updateMode ? 'display_metadata' : 'fill_form'; + if (!vm.stateParams.patient) { + $state.transitionTo(transitionTo); + } else if (vm.stateParams.patient) { + $state.go('display_metadata.patient', { id : vm.stateParams.id, patient : vm.stateParams.patient }); + } + } +} diff --git a/client/src/modules/fill_form/templates/action.cell.html b/client/src/modules/fill_form/templates/action.cell.html new file mode 100644 index 0000000000..776c24f1c3 --- /dev/null +++ b/client/src/modules/fill_form/templates/action.cell.html @@ -0,0 +1,5 @@ +
+ + FORM.BUTTONS.FILL_FORM + +
diff --git a/client/src/modules/patients/record/bh-patient-medical-sheet.html b/client/src/modules/patients/record/bh-patient-medical-sheet.html new file mode 100644 index 0000000000..f2c163a7db --- /dev/null +++ b/client/src/modules/patients/record/bh-patient-medical-sheet.html @@ -0,0 +1,21 @@ +
+
+ + FORM.LABELS.MEDICAL_SHEETS +
+ +
+
+ + +
+
+
diff --git a/client/src/modules/patients/record/patient-record.html b/client/src/modules/patients/record/patient-record.html index e0bc8afff5..e7487678dc 100644 --- a/client/src/modules/patients/record/patient-record.html +++ b/client/src/modules/patients/record/patient-record.html @@ -132,6 +132,15 @@
+ +
+ +
+ + +
+
+
diff --git a/client/src/modules/reports/generate/dataKit/dataKit.config.js b/client/src/modules/reports/generate/dataKit/dataKit.config.js new file mode 100644 index 0000000000..79115eefd9 --- /dev/null +++ b/client/src/modules/reports/generate/dataKit/dataKit.config.js @@ -0,0 +1,133 @@ +angular.module('bhima.controllers') + .controller('dataKitController', DataKitConfigController); + +DataKitConfigController.$inject = [ + '$sce', 'NotifyService', 'BaseReportService', 'AppCache', 'reportData', '$state', 'SurveyFormService', + 'ChoicesListManagementService', +]; + + +function DataKitConfigController($sce, Notify, SavedReports, AppCache, reportData, $state, SurveyForm, + ChoicesList) { + const vm = this; + const cache = new AppCache('data_kit'); + const reportUrl = '/data_kit/report'; + vm.reportDetails = {}; + vm.reportDetails.searchDateFrom = {}; + vm.reportDetails.searchDateTo = {}; + vm.reportDetails.multipleChoice = {}; + vm.reportDetails.loggedChanges = {}; + vm.onSelectList = onSelectList; + vm.onSelectMultiple = onSelectMultiple; + vm.onClear = onClear; + + vm.previewGenerated = false; + vm.onSelectSurveyForm = onSelectSurveyForm; + checkCachedConfiguration(); + + function onSelectSurveyForm(collector) { + vm.reportDetails = {}; + vm.reportDetails.searchDateFrom = {}; + vm.reportDetails.searchDateTo = {}; + vm.reportDetails.multipleChoice = {}; + vm.reportDetails.loggedChanges = {}; + + vm.reportDetails.data_collector_id = collector.id; + delete cache.reportDetails; + + SurveyForm.read(null, { data_collector_management_id : collector.id }) + .then(surveyElements => { + vm.formItems = surveyElements; + return ChoicesList.read(); + }) + .then(choicesLists => { + vm.choicesLists = choicesLists; + }) + .catch(Notify.handleError); + } + + function onSelectList(list, value) { + vm.reportDetails[value] = list.id; + vm.reportDetails.loggedChanges[value] = list.label; + } + + function onSelectMultiple(lists, value) { + vm.reportDetails.multipleChoice[value] = lists; + } + + function onClear(value) { + delete vm.reportDetails[value]; + delete vm.reportDetails.loggedChanges[value]; + } + + vm.preview = function preview(form) { + if (form.$invalid) { return; } + cache.reportDetails = angular.copy(vm.reportDetails); + + if (vm.reportDetails.multipleChoice) { + const multipleChoiceLength = Object.keys(vm.reportDetails.multipleChoice).length; + + if (multipleChoiceLength) { + Object.keys(vm.reportDetails.multipleChoice).forEach((key) => { + if (vm.reportDetails.multipleChoice[key].length) { + for (let i = 0; i < vm.reportDetails.multipleChoice[key].length; i++) { + vm.choicesLists.forEach(list => { + if (list.id === vm.reportDetails.multipleChoice[key][i]) { + vm.reportDetails.multipleChoice[key][i] = list.label; + } + }); + } + } else { + delete vm.reportDetails.multipleChoice[key]; + } + }); + } + } + + SavedReports.requestPreview(reportUrl, reportData.id, angular.copy(vm.reportDetails)) + .then((result) => { + vm.previewGenerated = true; + vm.previewResult = $sce.trustAsHtml(result); + }) + .catch(Notify.handleError); + }; + + vm.clearPreview = function clearPreview() { + vm.previewGenerated = false; + vm.previewResult = null; + }; + + vm.requestSaveAs = function requestSaveAs() { + + const options = { + url : reportUrl, + report : reportData, + reportOptions : angular.copy(vm.reportDetails), + }; + + return SavedReports.saveAsModal(options) + .then(() => { + $state.go('reportsBase.reportsArchive', { key : options.report.report_key }); + }) + .catch(Notify.handleError); + }; + + function checkCachedConfiguration() { + if (cache.reportDetails) { + vm.reportDetails = angular.copy(cache.reportDetails); + + if (vm.reportDetails.data_collector_id) { + SurveyForm.read(null, { data_collector_management_id : vm.reportDetails.data_collector_id }) + .then(surveyElements => { + vm.formItems = surveyElements; + return ChoicesList.read(); + }) + .then(choicesLists => { + vm.choicesLists = choicesLists; + }) + .catch(Notify.handleError); + } + } + vm.reportDetails.type = 1; + } +} diff --git a/client/src/modules/reports/generate/dataKit/dataKit.html b/client/src/modules/reports/generate/dataKit/dataKit.html new file mode 100644 index 0000000000..0a51d38c99 --- /dev/null +++ b/client/src/modules/reports/generate/dataKit/dataKit.html @@ -0,0 +1,116 @@ + + + +
+
+
+

TREE.DATA_KIT_REPORT

+
+
+ +
+
+
+
+ REPORT.UTIL.OPTIONS +
+ +
+
+ + + + + +
+ +
+
+
+
+ + +
+ + + +
+
+
+ +
+
+ + +
+ + + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+
+ + +
+
+
+
+ + + REPORT.UTIL.PREVIEW + +
+
+
+
+
+
\ No newline at end of file diff --git a/client/src/modules/reports/reports.routes.js b/client/src/modules/reports/reports.routes.js index d2d16f682b..e7d70a162f 100644 --- a/client/src/modules/reports/reports.routes.js +++ b/client/src/modules/reports/reports.routes.js @@ -41,6 +41,7 @@ angular.module('bhima.routes') 'analysisAuxiliaryCash', 'realizedProfit', 'systemUsageStat', + 'dataKit', ]; $stateProvider diff --git a/client/src/modules/survey_form/modals/survey_form.modals.html b/client/src/modules/survey_form/modals/survey_form.modals.html index e2f931cef3..610f4b4d84 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.html +++ b/client/src/modules/survey_form/modals/survey_form.modals.html @@ -32,6 +32,24 @@

required="true"> + +
+ +
+ +
+
+
+
+
+
-->

+ +
+ +
+ +
+
+
+
+
@@ -119,19 +147,9 @@

- - +
- - +
+ + +
+ +
+ +
+
+ + + +
+
+ + +

{{translate 'TREE.DATA_KIT_REPORT'}}

+

{{ dataCollector.label }}

+ {{#if patient.display_name }} +
+

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

+

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

+

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

+
+ {{/if}} + + + + + + {{#each rows.columns}} + + {{/each}} + + + + + {{#each rows.surveyData}} + + {{#each rowValue}} + + {{/each}} + + {{/each}} + +
{{translate displayName}}
+ {{ value }} +
+
+
+
+ + + + + + + {{#each filterQuery}} + + + + + {{/each}} + +
{{ translate 'FORM.INFO.RESULT_FOUND'}} {{ resultFound }}
{{ translate key }}{{ value }}
+
+ + {{ filterClient }} + + +
+
+ + diff --git a/server/controllers/admin/metadataReport/metadatacard.handlebars b/server/controllers/admin/metadataReport/metadatacard.handlebars new file mode 100644 index 0000000000..5490cd7ffa --- /dev/null +++ b/server/controllers/admin/metadataReport/metadatacard.handlebars @@ -0,0 +1,67 @@ +{{> head title="TREE.DISPLAY_METADATA"}} + + {{> header}} + + +
+
+ + +

+ {{ survey.label }} +

+ {{#if patient.display_name }} +
+

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

+

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

+

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

+
+ {{/if}} + + + {{#each surveyFormElements}} + {{#equal typeForm 'note'}} + + + + {{/equal}} + {{#inequal typeForm 'note'}} + + + + + + + + {{/inequal}} + {{/each}} +
+

+ + {{ label }} + +

+
+ + {{ label }} + +
+ {{#equal typeForm 'date'}} + {{date value "DD/MM/YYYY"}} + {{/equal}} + {{#inequal typeForm 'date'}} + {{#equal typeForm 'image'}} + {{#fileExist ../absolutePath value}} + + + + {{/fileExist}} + {{/equal}} + {{#inequal typeForm 'image'}} + {{value}} + {{/inequal}} + {{/inequal}} +
+
+
+ \ No newline at end of file diff --git a/server/controllers/admin/surveyForm.js b/server/controllers/admin/surveyForm.js index 2b60c32b46..e85175779f 100644 --- a/server/controllers/admin/surveyForm.js +++ b/server/controllers/admin/surveyForm.js @@ -7,11 +7,12 @@ const db = require('../../lib/db'); const NotFound = require('../../lib/errors/NotFound'); const FilterParser = require('../../lib/filter'); +const util = require('../../lib/util'); // GET /survey_form function lookupSurveyForm(id) { const sql = ` - SELECT s.id, s.data_collector_management_id, s.type, s.name, s.label, s.hint, s.required, s.constraint, + SELECT s.id, s.rank, s.data_collector_management_id, s.type, s.name, s.label, s.hint, s.required, s.constraint, s.default, s.calculation, s.choice_list_id, s.filter_choice_list_id, s.other_choice FROM survey_form AS s WHERE s.id = ?`; @@ -23,7 +24,7 @@ function getSurveyFormElement(params) { const filters = new FilterParser(params, { tableAlias : 's' }); const sql = ` - SELECT s.id, s.data_collector_management_id, s.type, s.name, s.label, + SELECT s.id, s.rank, s.data_collector_management_id, s.type, s.name, s.label, s.hint, s.filter_choice_list_id, s.required, s.constraint, s.default, s.calculation, s.choice_list_id, s.other_choice, d.label AS data_collector_label, d.color, d.description, d.version_number, sft.label AS typeLabel, @@ -37,6 +38,7 @@ function getSurveyFormElement(params) { filters.equals('data_collector_management_id'); filters.equals('is_list', 'is_list', 'sft'); + filters.setOrder('ORDER BY s.rank ASC'); const query = filters.applyQuery(sql); const parameters = filters.parameters(); @@ -89,7 +91,7 @@ function create(req, res, next) { db.exec(sql, [data]) .then((row) => { - res.status(201).json({ id : row.insertId }); + res.status(201).json({ id: row.insertId }); }) .catch(next) .done(); @@ -105,7 +107,7 @@ function update(req, res, next) { return lookupSurveyForm(req.params.id); }) .then((record) => { - // all updates completed successfull, return full object to client + // all updates completed successfull, return full object to client res.status(200).json(record); }) .catch(next) @@ -118,7 +120,7 @@ function remove(req, res, next) { db.exec(sql, [req.params.id]) .then((row) => { - // if nothing happened, let the client know via a 404 error + // if nothing happened, let the client know via a 404 error if (row.affectedRows === 0) { throw new NotFound(`Could not find a function with id ${req.params.id}`); } @@ -129,6 +131,16 @@ function remove(req, res, next) { .done(); } +function getCalculation(survey, data) { + let formula = survey.calculation; + + formula = formula.replace(/.{/g, 'data.'); + formula = formula.replace(/}/g, ''); + const calculation = util.roundDecimal(eval(formula), 2); + + return calculation || 0; +} + // get list of surveyForm element exports.list = list; @@ -149,3 +161,6 @@ exports.listSurveyformtype = listSurveyformtype; // get survey form element exports.getSurveyFormElement = getSurveyFormElement; + +// Get Calculation +exports.getCalculation = getCalculation; diff --git a/server/lib/template/helpers/logic.js b/server/lib/template/helpers/logic.js index 13595784c4..8420aa6f15 100644 --- a/server/lib/template/helpers/logic.js +++ b/server/lib/template/helpers/logic.js @@ -1,4 +1,6 @@ +const fs = require('mz/fs'); const util = require('../../util'); + // test equality function equal(a, b, options) { if (a === b) { @@ -28,7 +30,28 @@ function ignoreNan(val, symbol) { return isNumber ? `${util.roundDecimal(val, 2)} ${symbol}` : ''; } +// test inequality +function inequal(a, b, options) { + if (a !== b) { + return options.fn(this); + } + return options.inverse(this); +} + +// test File Exit +function fileExist(a, b, options) { + try { + fs.statSync(`${a}${b}`); + return options.fn(this); + + } catch (err) { + return options.inverse(this); + } +} + exports.equal = equal; exports.gt = gt; exports.lt = lt; exports.ignoreNan = ignoreNan; +exports.inequal = inequal; +exports.fileExist = fileExist; diff --git a/server/lib/template/index.js b/server/lib/template/index.js index cabda27e6a..07121d2bc1 100644 --- a/server/lib/template/index.js +++ b/server/lib/template/index.js @@ -45,6 +45,8 @@ const hbs = exphbs.create({ equal : logic.equal, gt : logic.gt, lt : logic.lt, + inequal : logic.inequal, + fileExist : logic.fileExist, absolute : math.absolute, getIncomeExpenseTitle : presentation.getTitle, isIncomeViewable : presentation.isIncomeViewable, diff --git a/server/models/bhima.sql b/server/models/bhima.sql index dc86248f49..6b661de5fc 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -133,16 +133,23 @@ INSERT INTO unit VALUES (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'), (248, 'Analysis of cashboxes', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE', 'Analysis of auxiliary cashboxes', 144, '/modules/reports/analysisAuxiliaryCash', '/reports/analysisAuxiliaryCash'), -<<<<<<< f8e1631cbe2732b5c563dc66426c38e20c035ebe (249, 'Realized Profit Report', 'TREE.REALIZED_PROFIT_REPORT', 'Realized profit report', 144, '/modules/reports/realizedProfit', '/reports/realizedProfit'), (250, 'Sytem usage statistic', 'REPORT.SYSTEM_USAGE_STAT.TITLE', 'Sytem usage statistic', 144, '/modules/reports/systemUsageStat', '/reports/systemUsageStat'), (251, 'indexes', 'TREE.INDEXES','The payrall-index', 57,'/modules/finance/','/PAYROLL_INDEX_FOLDER'), (252, 'Staffing indexes management','TREE.STAFFING_INDICES_MANAGEMENT','Staffing indices management',251 ,'/modules/payroll/staffing_indice','/staffing_indices'), - (253, 'Multiple Payroll by indice','TREE.MULTI_PAYROLL_INDICE','Multiple Payroll (indice)', 251,'/modules/multiple_payroll_indice','/multiple_payroll_indice'); -======= - (249, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), - (250, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'); ->>>>>>> Resolve conflict s1 + (253, 'Multiple Payroll by indice','TREE.MULTI_PAYROLL_INDICE','Multiple Payroll (indice)', 251,'/modules/multiple_payroll_indice','/multiple_payroll_indice'), + (254, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), + (255, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), + (256, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 249, '/modules/data_collector_management', '/data_collector_management'), + (257, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), + (258, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), + (259, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 246, '/modules/choices_list_management', '/choices_list_management'), + (260, 'Survey Form', 'TREE.SURVEY_FORM', '', 246, '/modules/survey_form', '/survey_form'); + (261, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), + (262, 'Fill Form', 'TREE.FILL_FORM', '', 250, '/modules/fill_form', '/fill_form'), + (263, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 250, '/modules/display_metadata', '/display_metadata'), + (264, '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 @@ -200,7 +207,8 @@ INSERT INTO `report` (`report_key`, `title_key`) VALUES ('clientSupport', 'REPORT.CLIENT_SUPPORT.TITLE'), ('analysisAuxiliaryCash', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE'), ('realizedProfit', 'REPORT.REALIZED.TITLE'), - ('systemUsageStat', 'REPORT.SYSTEM_USAGE_STAT.TITLE'); + ('systemUsageStat', 'REPORT.SYSTEM_USAGE_STAT.TITLE'), + ('dataKit', 'TREE.DATA_KIT_REPORT'); -- Supported Languages INSERT INTO `language` VALUES @@ -369,58 +377,3 @@ INSERT INTO `cron` (`label`, `value`) VALUES ('CRON.MONTHLY', '0 1 30 * *'), ('CRON.YEARLY', '0 1 31 12 *'), ('CRON.EACH_MINUTE', '* * * * *'); - --- data_collector_management -INSERT INTO `data_collector_management` (`label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES - ('Fiche Kardex', 'Fiche de consommation Medicament', '1.0', '#E0FFFF', 1); - --- choices_list_management -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (2, 'm', 'Masculin', 0, 1, 1, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (3, 'f', 'Féminin', 0, 1, 1, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (4, 'pays', 'Pays', 0, 0, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (5, 'province', 'Province', 0, 4, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (6, 'districte', 'Districte', 0, 5, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (7, 'ville', 'Ville', 0, 6, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (8, 'commune', 'Commune', 0, 7, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (9, 'quartier', 'Quartier', 0, 8, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (10, 'rdc', 'RD Congo', 0, 0, 4, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (11, 'kin', 'Kinshasa', 0, 10, 4, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (12, 'mont_amba', 'Mont Amba', 0, 11, 6, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (13, 'lemba', 'Lemba', 0, 12, 8, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (14, 'salongo', 'Salongo', 0, 13, 9, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (15, 'avenue', 'Avenue', 0, 9, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (16, 'bypass', 'By Pass', 0, 14, 15, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (17, 'kalala', 'Kalala', 0, 14, 0, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (18, 'funa', 'Funa', 0, 11, 6, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (22, 'medicament', 'Médicament', 0, 0, 0, 1, 1); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (23, 'ciprofloxacineCifin', 'ciprofloxacine (cifin ) 500 mg tab', 0, 22, 22, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (24, 'artesunate60mgInjFl', 'Artesunate 60mg inj. fl', 0, 22, 22, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (25, 'vitamineA50000iu', 'Vitamine A 50.000 iu', 0, 22, 22, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (26, 'paracetamol500mg', 'Paracetamol500 mg', 0, 22, 22, 0, 0); -INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (27, 'pentazocinetromadol30mg/ml', 'Pentazocine, Tromadol30mg/ml', 0, 22, 22, 0, 0); - --- Survey Form Type -INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES - ('FORM.LABELS.NUMBER', 'number', 0), - ('FORM.LABELS.TEXT', 'text', 0), - ('FORM.LABELS.SELECT_ONE', 'select_one', 1), - ('FORM.LABELS.SELECT_MULTIPLE', 'select_multiple', 1), - ('FORM.LABELS.NOTE', 'note', 0), - ('FORM.LABELS.DATE', 'date', 0), - ('FORM.LABELS.TIME', 'time', 0), - ('FORM.LABELS.IMAGE', 'image', 0), - ('FORM.LABELS.CALCULATION', 'calculation', 0); - --- survey_form -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (1, 1, '3', 22, NULL, 0, 'medicament', 'Médicament', 'Sélectionner le médicament', 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (2, 1, '1', NULL, NULL, 0, 'poids', 'Poids', NULL, 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (3, 1, '2', NULL, NULL, 0, 'dosekilos', 'Dose par kilogramme', NULL, 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (4, 1, '1', NULL, NULL, 0, 'nombreFois', 'Nombre de fois', NULL, 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (5, 1, '2', NULL, NULL, 0, 'voie', 'Voie', NULL, 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (6, 1, '6', NULL, NULL, 0, 'date', 'Date', NULL, 1, NULL, NULL, NULL); -INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`) VALUES (7, 1, '7', NULL, NULL, 0, 'temps', 'Temps', NULL, 1, NULL, NULL, NULL); - diff --git a/server/models/schema.sql b/server/models/schema.sql index 1853a20bc9..3b1ca0f113 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2399,6 +2399,7 @@ CREATE TABLE `survey_form` ( `constraint` VARCHAR(100) NULL, `default` VARCHAR(100) NULL, `calculation` VARCHAR(100) NULL, + `rank` SMALLINT(5) UNSIGNED NULL, PRIMARY KEY (`id`), UNIQUE KEY `survey_form_1` (`data_collector_management_id`, `name`, `label`), KEY `data_collector_management_id` (`data_collector_management_id`), @@ -2414,4 +2415,59 @@ CREATE TABLE `survey_form_type` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `survey_data`; +CREATE TABLE `survey_data` ( + `uuid` BINARY(16), + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `is_deleted` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`uuid`), + KEY `data_collector_management_id` (`data_collector_management_id`), + KEY `user_id` (`user_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`), + FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_item`; +CREATE TABLE `survey_data_item` ( + `uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_log`; +CREATE TABLE `survey_data_log` ( + `uuid` BINARY(16), + `log_uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `status` VARCHAR(20), + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `medical_sheet`; +CREATE TABLE `medical_sheet` ( + `survey_data_uuid` BINARY(16), + `patient_uuid` BINARY(16), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`), + FOREIGN KEY (`patient_uuid`) REFERENCES `patient` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + + SET foreign_key_checks = 1; diff --git a/test/end-to-end/displayMetadata/displayMetadata.page.js b/test/end-to-end/displayMetadata/displayMetadata.page.js new file mode 100644 index 0000000000..7e05cbb944 --- /dev/null +++ b/test/end-to-end/displayMetadata/displayMetadata.page.js @@ -0,0 +1,50 @@ +/* global element, browser, by */ +/* eslint */ + +/** + * This class is represents a Survey Form page in term of structure and + * behaviour so it is a Survey Form Management page object + */ + +/* loading grid actions */ +const GridRow = require('../shared/GridRow'); +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class displayMetadataManagementPage { + constructor() { + this.gridId = 'display-metadata-grid'; + this.dataGrid = element(by.id(this.gridId)); + this.actionLinkColumn = 8; + } + + /** + * simulate a click on the edit link of a function + */ + async updateMetadata(structure, surveyData) { + const row = new GridRow(structure); + row.dropdown().click(); + row.edit().click(); + + await browser.findElement(by.css('[name="label"]')).sendKeys(surveyData.label); + await browser.findElement(by.css('[name="longueur"]')).sendKeys(surveyData.longueur); + await browser.findElement(by.css('[name="largeur"]')).sendKeys(surveyData.largeur); + await browser.findElement(by.css('[name="nombre_agent"]')).sendKeys(surveyData.nombre_agent); + await browser.findElement(by.css('[name="nombre_femme"]')).sendKeys(surveyData.nombre_femme); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + // Delete Data of survey + async deleteDataSurvey(dataDelete) { + const row = new GridRow(dataDelete.label); + await row.dropdown().click(); + await row.remove().click(); + + await FU.modal.submit(); + await components.notification.hasSuccess(); + } +} + +module.exports = displayMetadataManagementPage; diff --git a/test/end-to-end/displayMetadata/displayMetadata.spec.js b/test/end-to-end/displayMetadata/displayMetadata.spec.js new file mode 100644 index 0000000000..024af4dea5 --- /dev/null +++ b/test/end-to-end/displayMetadata/displayMetadata.spec.js @@ -0,0 +1,37 @@ +const helpers = require('../shared/helpers'); +const DisplayMetadataManagement = require('./displayMetadata.page'); +const SearchModalPage = require('./searchModal.page.js'); + +describe('Metadata Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/display_metadata')); + + const Page = new DisplayMetadataManagement(); + const searchModalPage = new SearchModalPage(); + const formulaire = 'Formulaire Special'; + + const newSurveyData1 = { + label : 'Update', + longueur : 205, + largeur : 450, + nombre_agent : 300, + nombre_femme : 0, + }; + + const dataDelete = { + label : 'Access Project', + }; + + it('successfully Delete data for survey', async () => { + await searchModalPage.surveyFormSelect(formulaire); + await searchModalPage.submit(); + + await Page.deleteDataSurvey(dataDelete); + }); + + it(`successfully Searching for form data for posting and updatingSearches + = for form data for posting and updating`, async () => { + await Page.updateMetadata('IMA World Health', newSurveyData1); + }); + +}); diff --git a/test/end-to-end/displayMetadata/searchModal.page.js b/test/end-to-end/displayMetadata/searchModal.page.js new file mode 100644 index 0000000000..0b4b0b424e --- /dev/null +++ b/test/end-to-end/displayMetadata/searchModal.page.js @@ -0,0 +1,20 @@ +/* eslint */ +/** + * This class represents a modal search page + * behaviour so it is a modal search page object + */ + +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class SearchModalPage { + surveyFormSelect(form) { + return components.surveyFormSelect.set(form); + } + + submit() { + return FU.modal.submit(); + } +} + +module.exports = SearchModalPage; diff --git a/test/end-to-end/fillForm/fillForm.page.js b/test/end-to-end/fillForm/fillForm.page.js new file mode 100644 index 0000000000..887bb9c7b0 --- /dev/null +++ b/test/end-to-end/fillForm/fillForm.page.js @@ -0,0 +1,68 @@ +/* global element, browser, by */ +/* eslint */ + +/** + * This class is represents a Survey Form page in term of structure and + * behaviour so it is a Survey Form Management page object + */ + +/* loading grid actions */ +const GridRow = require('../shared/GridRow'); +const FU = require('../shared/FormUtils'); +const components = require('../shared/components'); + +class FillFormManagementPage { + constructor() { + this.gridId = 'fill-form-grid'; + this.rubricGrid = element(by.id(this.gridId)); + this.actionLinkColumn = 4; + } + + /** + * simulate the create Survey Form button click to show the dialog of creation + */ + async create(fillForm) { + await element(by.id('form_3')).click(); + await browser.findElement(by.css('[name="structure"]')).sendKeys(fillForm.structure); + await browser.findElement(by.css('[name="longueur"]')).sendKeys(fillForm.longueur); + await browser.findElement(by.css('[name="largeur"]')).sendKeys(fillForm.largeur); + await browser.findElement(by.css('[name="nombre_agent"]')).sendKeys(fillForm.nombre_agent); + await browser.findElement(by.css('[name="nombre_femme"]')).sendKeys(fillForm.nombre_femme); + await browser.findElement(by.css('[name="raison"]')).sendKeys(fillForm.raison); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + async createComplexe(fillForm) { + await element(by.id('form_1')).click(); + + await components.choiceListSelect.set(fillForm.choice_list_id, 'label'); + await browser.findElement(by.css('[name="poids"]')).sendKeys(fillForm.poids); + await browser.findElement(by.css('[name="dosekilos"]')).sendKeys(fillForm.dosekilos); + await browser.findElement(by.css('[name="nombreFois"]')).sendKeys(fillForm.nombreFois); + await browser.findElement(by.css('[name="voie"]')).sendKeys(fillForm.voie); + await browser.findElement(by.css('[ng-model="hours"]')).sendKeys(fillForm.hours); + await browser.findElement(by.css('[ng-model="minutes"]')).sendKeys(fillForm.minutes); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } + + async fillPatientSheet(fillForm) { + await FU.buttons.create(); + + await components.choiceListSelect.set(fillForm.choice_list_id, 'label'); + await browser.findElement(by.css('[name="poids"]')).sendKeys(fillForm.poids); + await browser.findElement(by.css('[name="dosekilos"]')).sendKeys(fillForm.dosekilos); + await browser.findElement(by.css('[name="nombreFois"]')).sendKeys(fillForm.nombreFois); + await browser.findElement(by.css('[name="voie"]')).sendKeys(fillForm.voie); + await browser.findElement(by.css('[ng-model="hours"]')).sendKeys(fillForm.hours); + await browser.findElement(by.css('[ng-model="minutes"]')).sendKeys(fillForm.minutes); + + await FU.buttons.submit(); + await components.notification.hasSuccess(); + } +} + +module.exports = FillFormManagementPage; diff --git a/test/end-to-end/fillForm/fillForm.spec.js b/test/end-to-end/fillForm/fillForm.spec.js new file mode 100644 index 0000000000..7811f63cc6 --- /dev/null +++ b/test/end-to-end/fillForm/fillForm.spec.js @@ -0,0 +1,39 @@ +const helpers = require('../shared/helpers'); +const FillFormManagement = require('./fillForm.page'); + +describe('Fill Form Management', () => { + // navigate to the page + before(() => helpers.navigate('#!/fill_form')); + + const Page = new FillFormManagement(); + + const newSurveyData1 = { + label : 'Formulaire Special', + structure : 'IMA World Health', + longueur : 75, + largeur : 40, + nombre_agent : 120, + nombre_femme : 2, + raison : 'Pas de raison valable', + }; + + const newSurveyData2 = { + choice_list_id : 'Paracetamol500 mg', + poids : 45, + dosekilos : '2', + nombreFois : 3, + voie : 'IV', + date : '2008-05-18', + temps : '14:50', + hours : '12', + minutes : '45', + }; + + it('successfully creates a new Survey data Element', async () => { + await Page.create(newSurveyData1); + }); + + it('successfully creates a new Survey data Element for complexe form', async () => { + await Page.createComplexe(newSurveyData2); + }); +}); diff --git a/test/end-to-end/patient/record.spec.js b/test/end-to-end/patient/record.spec.js index 9ded483df6..6dd3274e1f 100644 --- a/test/end-to-end/patient/record.spec.js +++ b/test/end-to-end/patient/record.spec.js @@ -8,13 +8,14 @@ const moment = require('moment'); const components = require('../shared/components'); const helpers = require('../shared/helpers'); const FU = require('../shared/FormUtils'); - +const FillFormManagement = require('../fillForm/fillForm.page'); // path to the fixtures directory const fixtures = path.resolve(__dirname, '../../fixtures/'); describe('Patient Record', () => { const root = '#!/patients/'; const id = '274c51ae-efcc-4238-98c6-f402bfb39866'; + const fillForm = new FillFormManagement(); const patient = { name : 'Test 2 Patient', @@ -27,8 +28,26 @@ describe('Patient Record', () => { const age = (dob) => `${moment().diff(dob, 'years')}`; const url = root.concat(id); + const dataMedicalSheet = { + choice_list_id : 'Paracetamol500 mg', + poids : 68.9, + dosekilos : 1, + nombreFois : 3, + voie : 'Orale', + date : '1986-09-07', + temps : '03:16', + hours : '15', + minutes : '00', + }; + before(() => helpers.navigate(url)); + it(`View and complete a patient's medical sheet`, async () => { + await element(by.id('form_1')).click(); + await fillForm.fillPatientSheet(dataMedicalSheet); + helpers.navigate(url); + }); + it('downloads and correctly displays patient information', async () => { await FU.hasText(by.id('name'), patient.name); await FU.hasText(by.id('patientID'), patient.id); diff --git a/test/end-to-end/shared/components/bhSurveyFormSelect.js b/test/end-to-end/shared/components/bhSurveyFormSelect.js new file mode 100644 index 0000000000..e6b3341c1e --- /dev/null +++ b/test/end-to-end/shared/components/bhSurveyFormSelect.js @@ -0,0 +1,17 @@ +/* global element, by */ + +const FU = require('../FormUtils'); + +module.exports = { + selector : '[bh-survey-form-select]', + set : async function set(surveyForm, id) { + const locator = (id) ? by.id(id) : by.css(this.selector); + const target = element(locator); + + // hack to make sure previous 'blur' event fires if we are using + // ngModelOptions updateOn 'blur' for every input + await target.click(); + + await FU.uiSelect('$ctrl.form', surveyForm, target); + }, +}; diff --git a/test/end-to-end/shared/components/index.js b/test/end-to-end/shared/components/index.js index 6545537e4d..de83afd732 100644 --- a/test/end-to-end/shared/components/index.js +++ b/test/end-to-end/shared/components/index.js @@ -75,4 +75,5 @@ module.exports = { dataCollector : require('./bhDataCollector'), surveyFormTypeSelect : require('./bhSurveyFormTypeSelect'), surveyListSelect : require('./bhSurveyListSelect'), + surveyFormSelect : require('./bhSurveyFormSelect'), }; diff --git a/test/integration/dataCollectorManagement.js b/test/integration/dataCollectorManagement.js index 7bb627ecf9..def311e006 100644 --- a/test/integration/dataCollectorManagement.js +++ b/test/integration/dataCollectorManagement.js @@ -2,7 +2,7 @@ const helpers = require('./helpers'); describe('(/data_collector_management) Data Collector Management', () => { - const numDataCollector = 2; + const numDataCollector = 3; const newDataCollector = { label : 'Consultations externes', diff --git a/test/integration/fillForm.js b/test/integration/fillForm.js new file mode 100644 index 0000000000..816d7f4134 --- /dev/null +++ b/test/integration/fillForm.js @@ -0,0 +1,144 @@ +/* global expect, agent */ +const helpers = require('./helpers'); + +describe('(/fill_form) Fill Form', () => { + const numDataSurvey = 7; + + const surveyElement1 = { + medicament : 24, + poids : 15, + dosekilos : '1', + nombreFois : 3, + voie : 'IV', + date : '2019-08-21 23:00:00', + temps : '2019-08-21 19:25:55', + medConsommes : [24, 23, 26], + data_collector_management_id : '1', + }; + + const surveyElement2 = { + surface : '.{longueur} * .{largeur}', + note_1 : '25', + structure : 'IMA World Health', + longueur : 75, + largeur : 40, + nombre_agent : 120, + nombre_femme : 2, + raison : 'Pas de raison valable', + data_collector_management_id : 3, + }; + + const surveyUpdate = { + old : { + structure : 'IMA World Health', + longueur : 25, + largeur : 10, + surface : '250', + nombre_agent : 120, + nombre_femme : 45, + note_1 : '25', + raison : '', + }, + new : { + structure : 'IMA World Health', + longueur : 45, + largeur : 22, + surface : '250', + nombre_agent : 120, + nombre_femme : 45, + note_1 : '25', + raison : '', + data_collector_management_id : 3, + }, + }; + + const params = { + changes : { + loggedChanges : [ + { + key : 'data_collector_id', + value : 3, + }], + collectorId : 3, + searchDateFrom : { + dateSurvey : '2018-12-31', + }, + searchDateTo : { + dateSurvey : '2019-12-31', + }, + multipleChoice : {}, + }, + data_collector_management_id : 3, + }; + + it('POST /fill_form fill survey form 1', () => { + return agent.post('/fill_form') + .send(surveyElement1) + .then((res) => { + helpers.api.created(res); + surveyElement1.uuid = res.body.uuid; + }) + .catch(helpers.handler); + }); + + it('POST /fill_form fill survey form 2', () => { + return agent.post('/fill_form') + .send(surveyElement2) + .then((res) => { + helpers.api.created(res); + surveyElement2.uuid = res.body.uuid; + }) + .catch(helpers.handler); + }); + + it('GET /fill_form/:uuid returns one survey form element detail', () => { + return agent.get(`/fill_form/${surveyElement2.uuid}`) + .then((res) => { + res.body.forEach(item => { + if (item.survey_form_label === 'surface') { + expect(parseInt(item.value, 10)).to.equal(75 * 40); + + expect(item).to.have.all.keys('survey_data_item_uuid', 'survey_form_id', 'survey_form_label', + 'survey_data_uuid', 'value'); + } + }); + }) + .catch(helpers.handler); + }); + + it('PUT /fill_form/:uuid updates the newly added Choice List Management', () => { + return agent.put(`/fill_form/${surveyElement2.uuid}`) + .send(surveyUpdate) + .then((res) => { + expect(res).to.have.status(201); + expect(res).to.be.a('object'); + expect(res.body.uuid).to.equal(surveyElement2.uuid); + }) + .catch(helpers.handler); + }); + + it('GET /fill_form returns all data from survey', () => { + return agent.get(`/fill_form/${surveyElement2.uuid}`) + .then((res) => { + expect(res.body.length).to.equal(numDataSurvey); + }) + .catch(helpers.handler); + }); + + it('GET /display_metadata returns all data from survey', () => { + return agent.get(`/display_metadata/`) + .query(params) + .then((res) => { + expect(res.body).to.have.all.keys('columns', 'surveyData'); + }) + .catch(helpers.handler); + }); + + it('DELETE /display_metadata/:uuid deletes a survey form element', () => { + return agent.delete(`/display_metadata/${surveyElement2.uuid}`) + .then((res) => { + expect(res).to.have.status(204); + }) + .catch(helpers.handler); + }); +}); diff --git a/test/integration/surveyForm.js b/test/integration/surveyForm.js index e65d6847e4..449e87511d 100644 --- a/test/integration/surveyForm.js +++ b/test/integration/surveyForm.js @@ -2,7 +2,7 @@ const helpers = require('./helpers'); describe('(/survey_form) Survey Form', () => { - const numListElement = 9; + const numListElement = 17; const formElement = { data_collector_management_id : 1, @@ -10,6 +10,7 @@ describe('(/survey_form) Survey Form', () => { label : 'Image du patient', name : 'imagePatient', required : 1, + rank : 8, }; const formElement1 = { @@ -18,6 +19,7 @@ describe('(/survey_form) Survey Form', () => { choice_list_id : 22, name : 'medConsommes', label : 'Médicaments consommés', + rank : 8, }; const updateFormElement = { @@ -33,6 +35,7 @@ describe('(/survey_form) Survey Form', () => { choice_list_id : 22, filter_choice_list_id : null, other_choice : 0, + rank : 8, }; it('POST /survey_form add Form Element', () => { @@ -62,7 +65,7 @@ describe('(/survey_form) Survey Form', () => { expect(res).to.be.a('object'); expect(res.body).to.have.all.keys('id', 'data_collector_management_id', 'type', 'choice_list_id', - 'filter_choice_list_id', 'other_choice', 'name', 'label', 'hint', + 'filter_choice_list_id', 'other_choice', 'name', 'label', 'hint', 'rank', 'required', 'constraint', 'default', 'calculation'); }) .catch(helpers.handler); @@ -87,7 +90,7 @@ describe('(/survey_form) Survey Form', () => { 'id', 'is_list', 'label', 'labelType', 'name', 'other_choice', 'required', 'type', 'typeForm', 'typeLabel', 'version_number', 'calculation', 'choiceListLabel', 'choice_list_id', 'color', 'constraint', 'data_collector_label', 'data_collector_management_id', - 'default', 'description', 'filterLabel', 'filter_choice_list_id', 'hint'); + 'default', 'description', 'filterLabel', 'filter_choice_list_id', 'hint', 'rank'); }) .catch(helpers.handler); }); From f23a4e4efb15436109af941580899f2f34194048 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 25 Oct 2019 13:14:53 +0100 Subject: [PATCH 06/30] Rebase with branch Master --- server/models/bhima.sql | 28 ++++ server/models/migrations/next/migrate.sql | 3 + .../migrations/v1.2.0-v1.3.0/migrate.sql | 151 ++++++++++++++++++ test/data.sql | 79 +++++++++ 4 files changed, 261 insertions(+) diff --git a/server/models/bhima.sql b/server/models/bhima.sql index 6b661de5fc..f48032d5a2 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -133,6 +133,7 @@ INSERT INTO unit VALUES (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'), (248, 'Analysis of cashboxes', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE', 'Analysis of auxiliary cashboxes', 144, '/modules/reports/analysisAuxiliaryCash', '/reports/analysisAuxiliaryCash'), +<<<<<<< a097681f7d119f324581cd5b09f9dce5e3f5e5ab (249, 'Realized Profit Report', 'TREE.REALIZED_PROFIT_REPORT', 'Realized profit report', 144, '/modules/reports/realizedProfit', '/reports/realizedProfit'), (250, 'Sytem usage statistic', 'REPORT.SYSTEM_USAGE_STAT.TITLE', 'Sytem usage statistic', 144, '/modules/reports/systemUsageStat', '/reports/systemUsageStat'), (251, 'indexes', 'TREE.INDEXES','The payrall-index', 57,'/modules/finance/','/PAYROLL_INDEX_FOLDER'), @@ -149,6 +150,16 @@ INSERT INTO unit VALUES (262, 'Fill Form', 'TREE.FILL_FORM', '', 250, '/modules/fill_form', '/fill_form'), (263, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 250, '/modules/display_metadata', '/display_metadata'), (264, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); +======= + (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'); +>>>>>>> Resolve conflict s5 -- Reserved system account type @@ -377,3 +388,20 @@ INSERT INTO `cron` (`label`, `value`) VALUES ('CRON.MONTHLY', '0 1 30 * *'), ('CRON.YEARLY', '0 1 31 12 *'), ('CRON.EACH_MINUTE', '* * * * *'); +<<<<<<< a097681f7d119f324581cd5b09f9dce5e3f5e5ab +======= + + +-- Survey Form Type +INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES + ('FORM.LABELS.NUMBER', 'number', 0), + ('FORM.LABELS.TEXT', 'text', 0), + ('FORM.LABELS.SELECT_ONE', 'select_one', 1), + ('FORM.LABELS.SELECT_MULTIPLE', 'select_multiple', 1), + ('FORM.LABELS.NOTE', 'note', 0), + ('FORM.LABELS.DATE', 'date', 0), + ('FORM.LABELS.TIME', 'time', 0), + ('FORM.LABELS.IMAGE', 'image', 0), + ('FORM.LABELS.CALCULATION', 'calculation', 0), + ('FORM.LABELS.TEXT_AREA', 'text_area', 0); +>>>>>>> Resolve conflict s5 diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index cd4759fb36..9417a57dae 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -5,3 +5,6 @@ ALTER TABLE `stock_consumption` MODIFY `period_id` MEDIUMINT(8) UNSIGNED NOT NUL ALTER TABLE `stock_consumption` ADD CONSTRAINT `fk_inventory_uuid_sc` FOREIGN KEY (`inventory_uuid`) REFERENCES `inventory` (`uuid`); ALTER TABLE `stock_consumption` ADD CONSTRAINT `fk_depot_uuid_sc` FOREIGN KEY (`depot_uuid`) REFERENCES `depot` (`uuid`); ALTER TABLE `stock_consumption` ADD CONSTRAINT `fk_period_id_sc` FOREIGN KEY (`period_id`) REFERENCES `period` (`id`); +/* + * DATABASE CHANGES FOR VERSION 1.6.0 TO 1.7.0 + */ diff --git a/server/models/migrations/v1.2.0-v1.3.0/migrate.sql b/server/models/migrations/v1.2.0-v1.3.0/migrate.sql index 77c81fae9c..6e5b327ebe 100644 --- a/server/models/migrations/v1.2.0-v1.3.0/migrate.sql +++ b/server/models/migrations/v1.2.0-v1.3.0/migrate.sql @@ -41,6 +41,7 @@ DROP TABLE IF EXISTS profit_center; DROP TABLE IF EXISTS cost_center; /* +<<<<<<< 0a1dc9fb0870b8c9b3f828b0cfbd11d609051264:server/models/migrations/v1.2.0-v1.3.0/migrate.sql @author: mbayopanda @date: 2019-08-22 @description: issue #3856 @@ -50,6 +51,7 @@ INSERT INTO `unit` VALUES (247, 'Client support report', 'TREE.CLIENT_SUPPORT_REPORT', 'Client support report', 144, '/modules/reports/clientSupport', '/reports/clientSupport'); INSERT INTO `report` (`id`, `report_key`, `title_key`) VALUES +<<<<<<< 45e137d7cc0179c9a57468a1590b29198529c5c7 (36, 'clientDebts', 'REPORT.CLIENT_SUMMARY.TITLE'), (37, 'clientSupport', 'REPORT.CLIENT_SUPPORT.TITLE'); @@ -61,3 +63,152 @@ INSERT INTO unit VALUES INSERT INTO report (id, report_key, title_key) VALUES (38, 'analysisAuxiliaryCash', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE'); +======= + (37, 'clientDebts', 'REPORT.CLIENT_SUMMARY.TITLE'), + (38, 'clientSupport', 'REPORT.CLIENT_SUPPORT.TITLE'); +======= + * @author: lomamech + * @date: 2019-08-28 + * @description: bhima_data_collector +*/ +DROP TABLE IF EXISTS `data_collector_management`; +CREATE TABLE `data_collector_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `description` TEXT, + `version_number` INT(11) UNSIGNED NOT NULL, + `color` VARCHAR(8) NULL, + `is_related_patient` TINYINT(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `choices_list_management`; +CREATE TABLE `choices_list_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `fixed` tinyint(1) DEFAULT 0, + `parent` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `group_label` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `is_group` tinyint(1) NOT NULL DEFAULT 0, + `is_title` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `choices_list_management_1` (`label`, `name`, `parent`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_form`; +CREATE TABLE `survey_form` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `type` VARCHAR(100) NOT NULL, + `choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `filter_choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `other_choice` tinyint(1) DEFAULT 0, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `hint` TEXT, + `required` tinyint(1) DEFAULT 0, + `constraint` VARCHAR(100) NULL, + `default` VARCHAR(100) NULL, + `calculation` VARCHAR(100) NULL, + `rank` SMALLINT(5) UNSIGNED NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `survey_form_1` (`data_collector_management_id`, `name`, `label`), + KEY `data_collector_management_id` (`data_collector_management_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_form_type`; +CREATE TABLE `survey_form_type` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `type` VARCHAR(100) NOT NULL, + `is_list` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data`; +CREATE TABLE `survey_data` ( + `uuid` BINARY(16), + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `is_deleted` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`uuid`), + KEY `data_collector_management_id` (`data_collector_management_id`), + KEY `user_id` (`user_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`), + FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_item`; +CREATE TABLE `survey_data_item` ( + `uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_log`; +CREATE TABLE `survey_data_log` ( + `uuid` BINARY(16), + `log_uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `status` VARCHAR(20), + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `medical_sheet`; +CREATE TABLE `medical_sheet` ( + `survey_data_uuid` BINARY(16), + `patient_uuid` BINARY(16), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`), + FOREIGN KEY (`patient_uuid`) REFERENCES `patient` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + + +INSERT INTO `unit` VALUES + (246, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), + (247, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), + (248, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 246, '/modules/choices_list_management', '/choices_list_management'), + (249, 'Survey Form', 'TREE.SURVEY_FORM', '', 246, '/modules/survey_form', '/survey_form'), + (250, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), + (251, 'Fill Form', 'TREE.FILL_FORM', '', 250, '/modules/fill_form', '/fill_form'), + (252, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 250, '/modules/display_metadata', '/display_metadata'), + (253, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); + +INSERT INTO `report` (`id`, `report_key`, `title_key`) VALUES + (36, 'dataKit', 'TREE.DATA_KIT_REPORT'); + +-- Survey Form Type +INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES + ('FORM.LABELS.NUMBER', 'number', 0), + ('FORM.LABELS.TEXT', 'text', 0), + ('FORM.LABELS.SELECT_ONE', 'select_one', 1), + ('FORM.LABELS.SELECT_MULTIPLE', 'select_multiple', 1), + ('FORM.LABELS.NOTE', 'note', 0), + ('FORM.LABELS.DATE', 'date', 0), + ('FORM.LABELS.TIME', 'time', 0), + ('FORM.LABELS.IMAGE', 'image', 0), + ('FORM.LABELS.CALCULATION', 'calculation', 0), + ('FORM.LABELS.TEXT_AREA', 'text_area', 0); + +-- BHIMA DATA COLLECTOR +>>>>>>> improvement(Migrate file):server/models/migrations/next/migrate.sql +>>>>>>> rebase with master steep 5 diff --git a/test/data.sql b/test/data.sql index e75fe7ea23..05163449a4 100644 --- a/test/data.sql +++ b/test/data.sql @@ -1107,3 +1107,82 @@ INSERT INTO bed VALUES INSERT INTO `distribution_key` (`id`, `auxiliary_fee_center_id`, `principal_fee_center_id`, `rate`, `user_id`) VALUES (1, 4, 1, 60.00, 1); INSERT INTO `distribution_key` (`id`, `auxiliary_fee_center_id`, `principal_fee_center_id`, `rate`, `user_id`) VALUES (2, 4, 2, 20.00, 1); INSERT INTO `distribution_key` (`id`, `auxiliary_fee_center_id`, `principal_fee_center_id`, `rate`, `user_id`) VALUES (3, 4, 3, 20.00, 1); + +-- data_collector_management +INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES (1, 'Fiche Kardex', 'Fiche de consommation Medicament', 1, '#E0FFFF', 1); +INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES (3, 'Formulaire Special', NULL, 1, '#EE82EE', 0); + +-- choices_list_management +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (2, 'm', 'Masculin', 0, 1, 1, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (3, 'f', 'Féminin', 0, 1, 1, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (4, 'pays', 'Pays', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (5, 'province', 'Province', 0, 4, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (6, 'districte', 'Districte', 0, 5, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (7, 'ville', 'Ville', 0, 6, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (8, 'commune', 'Commune', 0, 7, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (9, 'quartier', 'Quartier', 0, 8, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (10, 'rdc', 'RD Congo', 0, 0, 4, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (11, 'kin', 'Kinshasa', 0, 10, 4, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (12, 'mont_amba', 'Mont Amba', 0, 11, 6, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (13, 'lemba', 'Lemba', 0, 12, 8, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (14, 'salongo', 'Salongo', 0, 13, 9, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (15, 'avenue', 'Avenue', 0, 9, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (16, 'bypass', 'By Pass', 0, 14, 15, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (17, 'kalala', 'Kalala', 0, 14, 0, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (18, 'funa', 'Funa', 0, 11, 6, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (19, 'kv', 'Kasa vubu', 0, 18, 8, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (20, 'mtg', 'Matonge', 0, 19, 9, 0, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (21, 'masimanimba', 'Masimanimba', 0, 20, 15, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (22, 'medicament', 'Médicament', 0, 0, 0, 1, 1); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (23, 'ciprofloxacineCifin', 'ciprofloxacine (cifin ) 500 mg tab', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (24, 'artesunate60mgInjFl', 'Artesunate 60mg inj. fl', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (25, 'vitamineA50000iu', 'Vitamine A 50.000 iu', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (26, 'paracetamol500mg', 'Paracetamol500 mg', 0, 22, 22, 0, 0); +INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (27, 'pentazocinetromadol30mg/ml', 'Pentazocine, Tromadol30mg/ml', 0, 22, 22, 0, 0); + +-- survey_form +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (1, 1, '3', 22, NULL, 0, 'label', 'Médicament', 'Sélectionner le médicament', 1, NULL, NULL, NULL, 1); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (2, 1, '1', NULL, NULL, 0, 'poids', 'Poids', NULL, 1, NULL, NULL, NULL, 2); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (3, 1, '2', NULL, NULL, 0, 'dosekilos', 'Dose par kilogramme', NULL, 1, NULL, NULL, NULL, 3); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (4, 1, '1', NULL, NULL, 0, 'nombreFois', 'Nombre de fois', NULL, 1, NULL, NULL, NULL, 4); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (5, 1, '2', NULL, NULL, 0, 'voie', 'Voie', NULL, 1, NULL, NULL, NULL, 5); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (6, 1, '6', NULL, NULL, 0, 'date', 'Date', NULL, 1, NULL, NULL, NULL, 6); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (7, 1, '7', NULL, NULL, 0, 'temps', 'Temps', NULL, 1, NULL, NULL, NULL, 7); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (8, 3, '2', NULL, NULL, 0, 'label', 'Structure', NULL, 1, NULL, NULL, NULL, 1); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (9, 3, '1', NULL, NULL, 0, 'longueur', 'Longueur', 'en mètre (m)', 1, NULL, NULL, NULL, 2); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (10, 3, '1', NULL, NULL, 0, 'largeur', 'largeur', 'en mètre (m)', 1, NULL, NULL, NULL, 3); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (11, 3, '9', NULL, NULL, 0, 'surface', 'Surface (m²)', NULL, 0, NULL, NULL, '.{longueur} * .{largeur}', 4); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (12, 3, '1', NULL, NULL, 0, 'nombre_agent', 'Nombre d''agent', NULL, 1, NULL, NULL, NULL, 5); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (13, 3, '1', NULL, NULL, 0, 'nombre_femme', 'Nombre des femmes', NULL, 1, NULL, NULL, NULL, 6); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (14, 3, '5', NULL, NULL, 0, 'note_1', 'Nombre des femmes inferieurs a 25', NULL, 1, '.{nombre_femme} < 25', '25', NULL, 7); +INSERT INTO `survey_form` (`id`, `data_collector_management_id`, `type`, `choice_list_id`, `filter_choice_list_id`, `other_choice`, `name`, `label`, `hint`, `required`, `constraint`, `default`, `calculation`, `rank`) VALUES (15, 3, '10', NULL, NULL, 0, 'raison', 'Raison inferieure', NULL, 0, '.{nombre_femme} < 25', NULL, NULL, 8); + +-- survey_data +INSERT INTO `survey_data` (`uuid`, `data_collector_management_id`, `date`, `user_id`, `is_deleted`) VALUES (0x24804F5966E74A8D83E8FE57EE60EFC3, 1, '2019-08-28 08:04:03', 1, 0); +INSERT INTO `survey_data` (`uuid`, `data_collector_management_id`, `date`, `user_id`, `is_deleted`) VALUES (0x2E6753DE87784432B1AE96F6220E7F85, 3, '2019-08-28 08:43:16', 1, 0); +INSERT INTO `survey_data` (`uuid`, `data_collector_management_id`, `date`, `user_id`, `is_deleted`) VALUES (0x7E10BE6083BF4EC5810FD47E2013E7AD, 3, '2019-08-27 21:15:58', 1, 0); + +-- survey_data_item +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x56CBC3715A3C45699C3612AD0E00BF00, 6, 'date', 0x24804F5966E74A8D83E8FE57EE60EFC3, '2019-08-16'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x01DDEAFBBC1540DEAE408B75BF8E117B, 3, 'dosekilos', 0x24804F5966E74A8D83E8FE57EE60EFC3, '20'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xF0D06189F43447A6A18AE710339C13FF, 8, 'label', 0x2E6753DE87784432B1AE96F6220E7F85, 'Access Project'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x9FC0EA45085E40B8AEBF9FDEBE276373, 1, 'label', 0x24804F5966E74A8D83E8FE57EE60EFC3, '23'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xCB7A4838D6F544029DC3C44973298C22, 10, 'largeur', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '40'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x4A64E8AC16ED4D5DA521759A44F9C151, 10, 'largeur', 0x2E6753DE87784432B1AE96F6220E7F85, '50'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xB39690C2DD924A689D3A644D60D81AC5, 9, 'longueur', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '75'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xDE878918262B4A41ABC11DADA19F01BE, 9, 'longueur', 0x2E6753DE87784432B1AE96F6220E7F85, '110'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x8A45E9C704474CCE9A53518D979DC435, 12, 'nombre_agent', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '112'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xBE53A92025D942E39A1E69CA839C700B, 12, 'nombre_agent', 0x2E6753DE87784432B1AE96F6220E7F85, '1359'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x3D145F3311CE4AF4A59B80A495F4DBCF, 13, 'nombre_femme', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '23'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x0B906678C97F4C1281641B6B9447997E, 13, 'nombre_femme', 0x2E6753DE87784432B1AE96F6220E7F85, '860'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xD375C86040304E62AAE4C03C3B111CB3, 4, 'nombreFois', 0x24804F5966E74A8D83E8FE57EE60EFC3, '2'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xBA712ED252CF45F9A693750FA04313DE, 14, 'note_1', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '25'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x0E57EFF1142F4F5E8416FBDBE53E4319, 14, 'note_1', 0x2E6753DE87784432B1AE96F6220E7F85, '25'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xE55FCC70352546F6A20B39FFFCFD9203, 2, 'poids', 0x24804F5966E74A8D83E8FE57EE60EFC3, '13'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x05DAAC76E4864FFEA21B4228236D96DD, 15, 'raison', 0x7E10BE6083BF4EC5810FD47E2013E7AD, 'Faible candidature'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x1B17203E39A848B3ABB1BA6655297BDA, 8, 'structure', 0x7E10BE6083BF4EC5810FD47E2013E7AD, 'IMA World Health'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0xEC7A04D98171476BB6A18CCA79C8A67F, 11, 'surface', 0x7E10BE6083BF4EC5810FD47E2013E7AD, '3000'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x3EEB3F9A5F5C4B5AB1C82E67DDD12D0B, 11, 'surface', 0x2E6753DE87784432B1AE96F6220E7F85, '5500'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x083E7B7DCC3642BCB03599B23C02CB62, 7, 'temps', 0x24804F5966E74A8D83E8FE57EE60EFC3, '12:24'); +INSERT INTO `survey_data_item` (`uuid`, `survey_form_id`, `survey_form_label`, `survey_data_uuid`, `value`) VALUES (0x9C388012F6CF408FBDD5B510649DBD58, 5, 'voie', 0x24804F5966E74A8D83E8FE57EE60EFC3, 'IV'); From afc3cc767e391fd20e46f3113187c9ae014fb80a Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Wed, 28 Aug 2019 12:59:02 +0100 Subject: [PATCH 07/30] improvement('Service color') - Sanitaze service color --- client/src/js/services/color.js | 259 ++++++++++++++++---------------- 1 file changed, 130 insertions(+), 129 deletions(-) diff --git a/client/src/js/services/color.js b/client/src/js/services/color.js index 17cfb87ac6..5accdb6fc2 100644 --- a/client/src/js/services/color.js +++ b/client/src/js/services/color.js @@ -28,135 +28,136 @@ function ColorService($translate) { { name : $translate.instant('COLORS.MAROON'), value : '#800000' }, { name : $translate.instant('COLORS.CRIMSON'), value : '#dc143c' }, { name : $translate.instant('COLORS.BLUEVIOLET'), value : '#8A2BE2' }, - { name : 'aliceblue', value : '#F0F8FF'}, - { name : 'antiquewhite', value : '#FAEBD7'}, - { name : 'aquamarine', value : '#7FFFD4'}, - { name : 'azure', value : '#F0FFFF'}, - { name : 'beige', value : '#F5F5DC'}, - { name : 'bisque', value : '#FFE4C4'}, - { name : 'blanchedalmond', value : '#FFEBCD'}, - { name : 'blue', value : '#0000FF'}, - { name : 'brown', value : '#A52A2A'}, - { name : 'burlywood', value : '#DEB887'}, - { name : 'cadetblue', value : '#5F9EA0'}, - { name : 'chartreuse', value : '#7FFF00'}, - { name : 'chocolate', value : '#D2691E'}, - { name : 'coral', value : '#FF7F50'}, - { name : 'cornflowerblue', value : '#6495ED'}, - { name : 'cornsilk', value : '#FFF8DC'}, - { name : 'cyan', value : '#00FFFF'}, - { name : 'darkblue', value : '#00008B'}, - { name : 'darkcyan', value : '#008B8B'}, - { name : 'darkgoldenrod', value : '#B8860B'}, - { name : 'darkgray', value : '#A9A9A9'}, - { name : 'darkgreen', value : '#006400'}, - { name : 'darkkhaki', value : '#BDB76B'}, - { name : 'darkmagenta', value : '#8B008B'}, - { name : 'darkolivegreen', value : '#556B2F'}, - { name : 'darkorange', value : '#FF8C00'}, - { name : 'darkorchid', value : '#9932CC'}, - { name : 'darkred', value : '#8B0000'}, - { name : 'darksalmon', value : '#E9967A'}, - { name : 'darkseagreen', value : '#8FBC8F'}, - { name : 'darkslateblue', value : '#483D8B'}, - { name : 'darkslategray', value : '#2F4F4F'}, - { name : 'darkturquoise', value : '#00CED1'}, - { name : 'darkviolet', value : '#9400D3'}, - { name : 'deeppink', value : '#FF1493'}, - { name : 'deepskyblue', value : '#00BFFF'}, - { name : 'dimgray', value : '#696969'}, - { name : 'dodgerblue', value : '#1E90FF'}, - { name : 'firebrick', value : '#B22222'}, - { name : 'floralwhite', value : '#FFFAF0'}, - { name : 'fuchsia', value : '#FF00FF'}, - { name : 'gainsboro', value : '#DCDCDC'}, - { name : 'ghostwhite', value : '#F8F8FF'}, - { name : 'gold', value : '#FFD700'}, - { name : 'goldenrod', value : '#DAA520'}, - { name : 'gray', value : '#808080'}, - { name : 'green', value : '#008000'}, - { name : 'greenyellow', value : '#ADFF2F'}, - { name : 'honeydew', value : '#F0FFF0'}, - { name : 'hotpink', value : '#FF69B4'}, - { name : 'indianred', value : '#CD5C5C'}, - { name : 'indigo', value : '#4B0082'}, - { name : 'ivory', value : '#FFFFF0'}, - { name : 'khaki', value : '#F0E68C'}, - { name : 'lavender', value : '#E6E6FA'}, - { name : 'lavenderblush', value : '#FFF0F5'}, - { name : 'lawngreen', value : '#7CFC00'}, - { name : 'lemonchiffon', value : '#FFFACD'}, - { name : 'lightblue', value : '#ADD8E6'}, - { name : 'lightcoral', value : '#F08080'}, - { name : 'lightcyan', value : '#E0FFFF'}, - { name : 'lightgoldenrodyellow', value : '#FAFAD2'}, - { name : 'lightgreen', value : '#90EE90'}, - { name : 'lightgrey', value : '#D3D3D3'}, - { name : 'lightpink', value : '#FFB6C1'}, - { name : 'lightsalmon', value : '#FFA07A'}, - { name : 'lightseagreen', value : '#20B2AA'}, - { name : 'lightskyblue', value : '#87CEFA'}, - { name : 'lightslategray', value : '#778899'}, - { name : 'lightsteelblue', value : '#B0C4DE'}, - { name : 'lightyellow', value : '#FFFFE0'}, - { name : 'limegreen', value : '#32CD32'}, - { name : 'linen', value : '#FAF0E6'}, - { name : 'magenta', value : '#FF00FF'}, - { name : 'mediumaquamarine', value : '#66CDAA'}, - { name : 'mediumblue', value : '#0000CD'}, - { name : 'mediumorchid', value : '#BA55D3'}, - { name : 'mediumpurple', value : '#9370DB'}, - { name : 'mediumseagreen', value : '#3CB371'}, - { name : 'mediumslateblue', value : '#7B68EE'}, - { name : 'mediumspringgreen', value : '#00FA9A'}, - { name : 'mediumturquoise', value : '#48D1CC'}, - { name : 'mediumvioletred', value : '#C71585'}, - { name : 'midnightblue', value : '#191970'}, - { name : 'mintcream', value : '#F5FFFA'}, - { name : 'mistyrose', value : '#FFE4E1'}, - { name : 'moccasin', value : '#FFE4B5'}, - { name : 'navajowhite', value : '#FFDEAD'}, - { name : 'navy', value : '#000080'}, - { name : 'oldlace', value : '#FDF5E6'}, - { name : 'olive', value : '#808000'}, - { name : 'olivedrab', value : '#6B8E23'}, - { name : 'orange', value : '#FFA500'}, - { name : 'orangered', value : '#FF4500'}, - { name : 'orchid', value : '#DA70D6'}, - { name : 'palegoldenrod', value : '#EEE8AA'}, - { name : 'palegreen', value : '#98FB98'}, - { name : 'paleturquoise ', value : '#AFEEEE'}, - { name : 'palevioletred', value : '#DB7093'}, - { name : 'papayawhip', value : '#FFEFD5'}, - { name : 'peachpuff', value : '#FFDAB9'}, - { name : 'peru', value : '#CD853F'}, - { name : 'pink', value : '#FFC0CB'}, - { name : 'plum', value : '#DDA0DD'}, - { name : 'powderblue', value : '#B0E0E6'}, - { name : 'purple', value : '#800080'}, - { name : 'rosybrown', value : '#BC8F8F'}, - { name : 'royalblue', value : '#4169E1'}, - { name : 'saddlebrown', value : '#8B4513'}, - { name : 'salmon', value : '#FA8072'}, - { name : 'sandybrown', value : '#F4A460'}, - { name : 'seagreen', value : '#2E8B57'}, - { name : 'seashell', value : '#FFF5EE'}, - { name : 'sienna', value : '#A0522D'}, - { name : 'silver', value : '#C0C0C0'}, - { name : 'skyblue', value : '#87CEEB'}, - { name : 'slategray', value : '#708090'}, - { name : 'snow', value : '#FFFAFA'}, - { name : 'springgreen', value : '#00FF7F'}, - { name : 'steelblue', value : '#4682B4'}, - { name : 'tan', value : '#D2B48C'}, - { name : 'teal', value : '#008080'}, - { name : 'thistle', value : '#D8BFD8'}, - { name : 'tomato', value : '#FF6347'}, - { name : 'turquoise', value : '#40E0D0'}, - { name : 'violet', value : '#EE82EE'}, - { name : 'wheat', value : '#F5DEB3'}, - { name : 'white', value : '#FFFFFF'}, - { name : 'whitesmoke', value : '#F5F5F5'}]; + { name : 'aliceblue', value : '#F0F8FF' }, + { name : 'antiquewhite', value : '#FAEBD7' }, + { name : 'aquamarine', value : '#7FFFD4' }, + { name : 'azure', value : '#F0FFFF' }, + { name : 'beige', value : '#F5F5DC' }, + { name : 'bisque', value : '#FFE4C4' }, + { name : 'blanchedalmond', value : '#FFEBCD' }, + { name : 'blue', value : '#0000FF' }, + { name : 'brown', value : '#A52A2A' }, + { name : 'burlywood', value : '#DEB887' }, + { name : 'cadetblue', value : '#5F9EA0' }, + { name : 'chartreuse', value : '#7FFF00' }, + { name : 'chocolate', value : '#D2691E' }, + { name : 'coral', value : '#FF7F50' }, + { name : 'cornflowerblue', value : '#6495ED' }, + { name : 'cornsilk', value : '#FFF8DC' }, + { name : 'cyan', value : '#00FFFF' }, + { name : 'darkblue', value : '#00008B' }, + { name : 'darkcyan', value : '#008B8B' }, + { name : 'darkgoldenrod', value : '#B8860B' }, + { name : 'darkgray', value : '#A9A9A9' }, + { name : 'darkgreen', value : '#006400' }, + { name : 'darkkhaki', value : '#BDB76B' }, + { name : 'darkmagenta', value : '#8B008B' }, + { name : 'darkolivegreen', value : '#556B2F' }, + { name : 'darkorange', value : '#FF8C00' }, + { name : 'darkorchid', value : '#9932CC' }, + { name : 'darkred', value : '#8B0000' }, + { name : 'darksalmon', value : '#E9967A' }, + { name : 'darkseagreen', value : '#8FBC8F' }, + { name : 'darkslateblue', value : '#483D8B' }, + { name : 'darkslategray', value : '#2F4F4F' }, + { name : 'darkturquoise', value : '#00CED1' }, + { name : 'darkviolet', value : '#9400D3' }, + { name : 'deeppink', value : '#FF1493' }, + { name : 'deepskyblue', value : '#00BFFF' }, + { name : 'dimgray', value : '#696969' }, + { name : 'dodgerblue', value : '#1E90FF' }, + { name : 'firebrick', value : '#B22222' }, + { name : 'floralwhite', value : '#FFFAF0' }, + { name : 'fuchsia', value : '#FF00FF' }, + { name : 'gainsboro', value : '#DCDCDC' }, + { name : 'ghostwhite', value : '#F8F8FF' }, + { name : 'gold', value : '#FFD700' }, + { name : 'goldenrod', value : '#DAA520' }, + { name : 'gray', value : '#808080' }, + { name : 'green', value : '#008000' }, + { name : 'greenyellow', value : '#ADFF2F' }, + { name : 'honeydew', value : '#F0FFF0' }, + { name : 'hotpink', value : '#FF69B4' }, + { name : 'indianred', value : '#CD5C5C' }, + { name : 'indigo', value : '#4B0082' }, + { name : 'ivory', value : '#FFFFF0' }, + { name : 'khaki', value : '#F0E68C' }, + { name : 'lavender', value : '#E6E6FA' }, + { name : 'lavenderblush', value : '#FFF0F5' }, + { name : 'lawngreen', value : '#7CFC00' }, + { name : 'lemonchiffon', value : '#FFFACD' }, + { name : 'lightblue', value : '#ADD8E6' }, + { name : 'lightcoral', value : '#F08080' }, + { name : 'lightcyan', value : '#E0FFFF' }, + { name : 'lightgoldenrodyellow', value : '#FAFAD2' }, + { name : 'lightgreen', value : '#90EE90' }, + { name : 'lightgrey', value : '#D3D3D3' }, + { name : 'lightpink', value : '#FFB6C1' }, + { name : 'lightsalmon', value : '#FFA07A' }, + { name : 'lightseagreen', value : '#20B2AA' }, + { name : 'lightskyblue', value : '#87CEFA' }, + { name : 'lightslategray', value : '#778899' }, + { name : 'lightsteelblue', value : '#B0C4DE' }, + { name : 'lightyellow', value : '#FFFFE0' }, + { name : 'limegreen', value : '#32CD32' }, + { name : 'linen', value : '#FAF0E6' }, + { name : 'magenta', value : '#FF00FF' }, + { name : 'mediumaquamarine', value : '#66CDAA' }, + { name : 'mediumblue', value : '#0000CD' }, + { name : 'mediumorchid', value : '#BA55D3' }, + { name : 'mediumpurple', value : '#9370DB' }, + { name : 'mediumseagreen', value : '#3CB371' }, + { name : 'mediumslateblue', value : '#7B68EE' }, + { name : 'mediumspringgreen', value : '#00FA9A' }, + { name : 'mediumturquoise', value : '#48D1CC' }, + { name : 'mediumvioletred', value : '#C71585' }, + { name : 'midnightblue', value : '#191970' }, + { name : 'mintcream', value : '#F5FFFA' }, + { name : 'mistyrose', value : '#FFE4E1' }, + { name : 'moccasin', value : '#FFE4B5' }, + { name : 'navajowhite', value : '#FFDEAD' }, + { name : 'navy', value : '#000080' }, + { name : 'oldlace', value : '#FDF5E6' }, + { name : 'olive', value : '#808000' }, + { name : 'olivedrab', value : '#6B8E23' }, + { name : 'orange', value : '#FFA500' }, + { name : 'orangered', value : '#FF4500' }, + { name : 'orchid', value : '#DA70D6' }, + { name : 'palegoldenrod', value : '#EEE8AA' }, + { name : 'palegreen', value : '#98FB98' }, + { name : 'paleturquoise ', value : '#AFEEEE' }, + { name : 'palevioletred', value : '#DB7093' }, + { name : 'papayawhip', value : '#FFEFD5' }, + { name : 'peachpuff', value : '#FFDAB9' }, + { name : 'peru', value : '#CD853F' }, + { name : 'pink', value : '#FFC0CB' }, + { name : 'plum', value : '#DDA0DD' }, + { name : 'powderblue', value : '#B0E0E6' }, + { name : 'purple', value : '#800080' }, + { name : 'rosybrown', value : '#BC8F8F' }, + { name : 'royalblue', value : '#4169E1' }, + { name : 'saddlebrown', value : '#8B4513' }, + { name : 'salmon', value : '#FA8072' }, + { name : 'sandybrown', value : '#F4A460' }, + { name : 'seagreen', value : '#2E8B57' }, + { name : 'seashell', value : '#FFF5EE' }, + { name : 'sienna', value : '#A0522D' }, + { name : 'silver', value : '#C0C0C0' }, + { name : 'skyblue', value : '#87CEEB' }, + { name : 'slategray', value : '#708090' }, + { name : 'snow', value : '#FFFAFA' }, + { name : 'springgreen', value : '#00FF7F' }, + { name : 'steelblue', value : '#4682B4' }, + { name : 'tan', value : '#D2B48C' }, + { name : 'teal', value : '#008080' }, + { name : 'thistle', value : '#D8BFD8' }, + { name : 'tomato', value : '#FF6347' }, + { name : 'turquoise', value : '#40E0D0' }, + { name : 'violet', value : '#EE82EE' }, + { name : 'wheat', value : '#F5DEB3' }, + { name : 'white', value : '#FFFFFF' }, + { name : 'whitesmoke', value : '#F5F5F5' } + ]; return service; } From 88043a97730a505010e950dc722187d96128aa1e Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Wed, 28 Aug 2019 13:10:55 +0100 Subject: [PATCH 08/30] Sanitaze code --- client/src/js/components/bhPatientMedicalSheet.js | 2 +- client/src/js/services/color.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/js/components/bhPatientMedicalSheet.js b/client/src/js/components/bhPatientMedicalSheet.js index 323e5def4c..2d4b5aaa45 100644 --- a/client/src/js/components/bhPatientMedicalSheet.js +++ b/client/src/js/components/bhPatientMedicalSheet.js @@ -87,7 +87,7 @@ function PatientMedicalSheetCtrl(DataCollectorManagement, Notify, uiGridConstant $ctrl.hasError = false; $ctrl.loading = true; - DataCollectorManagement.read(null, {is_related_patient : 1}) + DataCollectorManagement.read(null, { is_related_patient : 1 }) .then((dataCollectorManagement) => { $ctrl.gridOptions.data = dataCollectorManagement; }) diff --git a/client/src/js/services/color.js b/client/src/js/services/color.js index 5accdb6fc2..caf85afbe8 100644 --- a/client/src/js/services/color.js +++ b/client/src/js/services/color.js @@ -156,7 +156,7 @@ function ColorService($translate) { { name : 'violet', value : '#EE82EE' }, { name : 'wheat', value : '#F5DEB3' }, { name : 'white', value : '#FFFFFF' }, - { name : 'whitesmoke', value : '#F5F5F5' } + { name : 'whitesmoke', value : '#F5F5F5' }, ]; return service; From 572dc43f95d1d604a9d4191caae56f3501f33a0b Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Wed, 28 Aug 2019 13:42:48 +0100 Subject: [PATCH 09/30] improvement(Violations found) - Sanitaze code and add comment eslint-disable no-eval and eslint-disable no-unused-vars --- .../data_collector_management/data_collector_management.js | 2 +- client/src/modules/fill_form/modals/fill_form.modals.js | 2 +- server/controllers/admin/surveyForm.js | 6 +++++- test/end-to-end/fillForm/fillForm.page.js | 1 - test/integration/surveyForm.js | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/src/modules/data_collector_management/data_collector_management.js b/client/src/modules/data_collector_management/data_collector_management.js index 58c14c31ea..b0d1e8828f 100644 --- a/client/src/modules/data_collector_management/data_collector_management.js +++ b/client/src/modules/data_collector_management/data_collector_management.js @@ -52,7 +52,7 @@ function DataCollectorManagementController($state, DataCollectorManagement, Noti enableFiltering : 'true', headerCellFilter : 'translate', cellTemplate : '/modules/data_collector_management/templates/is_related_patient.cell.html', - }, + }, { field : 'color', displayName : '', diff --git a/client/src/modules/fill_form/modals/fill_form.modals.js b/client/src/modules/fill_form/modals/fill_form.modals.js index 3528a607a2..43c8573931 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.js +++ b/client/src/modules/fill_form/modals/fill_form.modals.js @@ -157,7 +157,7 @@ function FillFormModalController($state, FillForm, Notify, AppCache, return FillForm.read(vm.stateParams.uuid); }) .then(dataSurvey => { - vm.form = FillForm.formatData(vm.formItems, dataSurvey); + vm.form = FillForm.formatData(vm.formItems, dataSurvey); vm.oldData = FillForm.formatData(vm.formItems, dataSurvey); }) .catch(Notify.handleError); diff --git a/server/controllers/admin/surveyForm.js b/server/controllers/admin/surveyForm.js index e85175779f..a051845a7f 100644 --- a/server/controllers/admin/surveyForm.js +++ b/server/controllers/admin/surveyForm.js @@ -1,3 +1,5 @@ +/* eslint-disable no-eval */ +/* eslint-disable no-unused-vars */ /** * SURVEY FORM Controller * @@ -91,7 +93,7 @@ function create(req, res, next) { db.exec(sql, [data]) .then((row) => { - res.status(201).json({ id: row.insertId }); + res.status(201).json({ id : row.insertId }); }) .catch(next) .done(); @@ -131,7 +133,9 @@ function remove(req, res, next) { .done(); } + function getCalculation(survey, data) { + // the params data is used in function eval let formula = survey.calculation; formula = formula.replace(/.{/g, 'data.'); diff --git a/test/end-to-end/fillForm/fillForm.page.js b/test/end-to-end/fillForm/fillForm.page.js index 887bb9c7b0..c66b1b79d4 100644 --- a/test/end-to-end/fillForm/fillForm.page.js +++ b/test/end-to-end/fillForm/fillForm.page.js @@ -7,7 +7,6 @@ */ /* loading grid actions */ -const GridRow = require('../shared/GridRow'); const FU = require('../shared/FormUtils'); const components = require('../shared/components'); diff --git a/test/integration/surveyForm.js b/test/integration/surveyForm.js index 449e87511d..3d974ca5c3 100644 --- a/test/integration/surveyForm.js +++ b/test/integration/surveyForm.js @@ -90,7 +90,8 @@ describe('(/survey_form) Survey Form', () => { 'id', 'is_list', 'label', 'labelType', 'name', 'other_choice', 'required', 'type', 'typeForm', 'typeLabel', 'version_number', 'calculation', 'choiceListLabel', 'choice_list_id', 'color', 'constraint', 'data_collector_label', 'data_collector_management_id', - 'default', 'description', 'filterLabel', 'filter_choice_list_id', 'hint', 'rank'); + 'default', 'description', 'filterLabel', 'filter_choice_list_id', 'hint', 'rank' + ); }) .catch(helpers.handler); }); From feaa0c2f6ce834a2a594ef38fa05994fa292dc4c Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Wed, 28 Aug 2019 13:57:28 +0100 Subject: [PATCH 10/30] test(Fill Form) - Fix incorrect property in E2E test for Fill Form --- test/end-to-end/fillForm/fillForm.page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/end-to-end/fillForm/fillForm.page.js b/test/end-to-end/fillForm/fillForm.page.js index c66b1b79d4..d7129d0a18 100644 --- a/test/end-to-end/fillForm/fillForm.page.js +++ b/test/end-to-end/fillForm/fillForm.page.js @@ -22,7 +22,7 @@ class FillFormManagementPage { */ async create(fillForm) { await element(by.id('form_3')).click(); - await browser.findElement(by.css('[name="structure"]')).sendKeys(fillForm.structure); + await browser.findElement(by.css('[name="label"]')).sendKeys(fillForm.label); await browser.findElement(by.css('[name="longueur"]')).sendKeys(fillForm.longueur); await browser.findElement(by.css('[name="largeur"]')).sendKeys(fillForm.largeur); await browser.findElement(by.css('[name="nombre_agent"]')).sendKeys(fillForm.nombre_agent); From d951bb5a7c43c73f7ee60b1d706e3e898781764b Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:43:53 +0100 Subject: [PATCH 11/30] Rebase with branch master --- server/models/bhima.sql | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/server/models/bhima.sql b/server/models/bhima.sql index f48032d5a2..0f867a13c0 100644 --- a/server/models/bhima.sql +++ b/server/models/bhima.sql @@ -133,34 +133,19 @@ INSERT INTO unit VALUES (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'), (248, 'Analysis of cashboxes', 'REPORT.ANALYSIS_AUX_CASHBOXES.TITLE', 'Analysis of auxiliary cashboxes', 144, '/modules/reports/analysisAuxiliaryCash', '/reports/analysisAuxiliaryCash'), -<<<<<<< a097681f7d119f324581cd5b09f9dce5e3f5e5ab (249, 'Realized Profit Report', 'TREE.REALIZED_PROFIT_REPORT', 'Realized profit report', 144, '/modules/reports/realizedProfit', '/reports/realizedProfit'), (250, 'Sytem usage statistic', 'REPORT.SYSTEM_USAGE_STAT.TITLE', 'Sytem usage statistic', 144, '/modules/reports/systemUsageStat', '/reports/systemUsageStat'), (251, 'indexes', 'TREE.INDEXES','The payrall-index', 57,'/modules/finance/','/PAYROLL_INDEX_FOLDER'), (252, 'Staffing indexes management','TREE.STAFFING_INDICES_MANAGEMENT','Staffing indices management',251 ,'/modules/payroll/staffing_indice','/staffing_indices'), - (253, 'Multiple Payroll by indice','TREE.MULTI_PAYROLL_INDICE','Multiple Payroll (indice)', 251,'/modules/multiple_payroll_indice','/multiple_payroll_indice'), - (254, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), - (255, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), - (256, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 249, '/modules/data_collector_management', '/data_collector_management'), - (257, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), - (258, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), - (259, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 246, '/modules/choices_list_management', '/choices_list_management'), - (260, 'Survey Form', 'TREE.SURVEY_FORM', '', 246, '/modules/survey_form', '/survey_form'); - (261, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), - (262, 'Fill Form', 'TREE.FILL_FORM', '', 250, '/modules/fill_form', '/fill_form'), - (263, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 250, '/modules/display_metadata', '/display_metadata'), - (264, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); -======= - (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'); ->>>>>>> Resolve conflict s5 - + (253, 'Multiple Payroll by indice','TREE.MULTI_PAYROLL_INDICE','Multiple Payroll (indice)', 251,'/modules/multiple_payroll_indice','/multiple_payroll_indice'), + (254, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), + (255, 'Fill Form', 'TREE.FILL_FORM', '', 254, '/modules/fill_form', '/fill_form'), + (256, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 254, '/modules/display_metadata', '/display_metadata'), + (257, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 254, '/modules/data_kit', '/data_kit'), + (258, 'Data Collector Management', 'TREE.FORMS_MANAGEMENT', '', 257, '/modules/data_collector_management', '/data_collector_management'), + (259, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 257, '/modules/choices_list_management', '/choices_list_management'), + (260, 'Survey Form', 'TREE.FORMS_CONFIGURATION', '', 257, '/modules/survey_form', '/survey_form'), + (261, '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 @@ -221,6 +206,7 @@ INSERT INTO `report` (`report_key`, `title_key`) VALUES ('systemUsageStat', 'REPORT.SYSTEM_USAGE_STAT.TITLE'), ('dataKit', 'TREE.DATA_KIT_REPORT'); + -- Supported Languages INSERT INTO `language` VALUES (1,'Francais','fr', 'fr-be'), @@ -388,9 +374,6 @@ INSERT INTO `cron` (`label`, `value`) VALUES ('CRON.MONTHLY', '0 1 30 * *'), ('CRON.YEARLY', '0 1 31 12 *'), ('CRON.EACH_MINUTE', '* * * * *'); -<<<<<<< a097681f7d119f324581cd5b09f9dce5e3f5e5ab -======= - -- Survey Form Type INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES @@ -404,4 +387,3 @@ INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES ('FORM.LABELS.IMAGE', 'image', 0), ('FORM.LABELS.CALCULATION', 'calculation', 0), ('FORM.LABELS.TEXT_AREA', 'text_area', 0); ->>>>>>> Resolve conflict s5 From a8d57f6adb03a98fc5d8a492db7675a020e94a4d Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Thu, 12 Sep 2019 09:20:59 +0100 Subject: [PATCH 12/30] imporvement(Survey Form) - Disabled the button add when survey form is not selected --- client/src/modules/survey_form/survey_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/modules/survey_form/survey_form.html b/client/src/modules/survey_form/survey_form.html index af9b654ad7..f1030946ca 100644 --- a/client/src/modules/survey_form/survey_form.html +++ b/client/src/modules/survey_form/survey_form.html @@ -7,7 +7,7 @@
-
From ea916ba8f2b9ddfc6a97715d2e0fc24379467d86 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Thu, 12 Sep 2019 10:49:29 +0100 Subject: [PATCH 13/30] improvement(Fill Form) -Add the number of submissions for each survey form --- client/src/i18n/en/form.json | 1 + client/src/i18n/fr/form.json | 1 + client/src/modules/fill_form/fill_form.js | 7 ++++++ .../admin/dataCollectorManagement.js | 24 ++++++++++++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index bff1b04ff4..bbcfaacdab 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -543,6 +543,7 @@ "NO_FISCALYEAR_REGISTERED" : "There are no fiscal years registered so far! Click 'Create a Fiscal Year' to add your first fiscal year", "NO_PRICE_LIST" : "No Price List", "NUMBER": "Number", + "NUMBER_SUBMISSIONS": "Number of submissions", "OF": "Of", "OFF_DAYS": "Off Days", "OPENING_BALANCE": "Opening Balance", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index bd036e6f1b..076c1a96b4 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -544,6 +544,7 @@ "NO_FISCALYEAR_REGISTERED": "Il n'y a aucune année fiscale enregistré jusque là! Cliquez sur 'Créer L'année Fiscale' pour ajouter votre première année fiscale", "NO_PRICE_LIST" : "Aucune liste de prix", "NUMBER": "Nombre", + "NUMBER_SUBMISSIONS": "Nombre de soumissions", "NR": "N°", "OF": "De", "OFF_DAYS": "jours fériés", diff --git a/client/src/modules/fill_form/fill_form.js b/client/src/modules/fill_form/fill_form.js index 5447e6892f..e529df01f9 100644 --- a/client/src/modules/fill_form/fill_form.js +++ b/client/src/modules/fill_form/fill_form.js @@ -53,6 +53,13 @@ function FillFormController($state, DataCollectorManagement, Notify, uiGridConst headerCellFilter : 'translate', cellTemplate : '/modules/data_collector_management/templates/is_related_patient.cell.html', }, + { + field : 'number_submissions', + displayName : 'FORM.LABELS.NUMBER_SUBMISSIONS', + width : 200, + enableFiltering : 'true', + headerCellFilter : 'translate', + }, { field : 'action', displayName : '', diff --git a/server/controllers/admin/dataCollectorManagement.js b/server/controllers/admin/dataCollectorManagement.js index be78a61d19..48e6f48116 100644 --- a/server/controllers/admin/dataCollectorManagement.js +++ b/server/controllers/admin/dataCollectorManagement.js @@ -22,6 +22,7 @@ function lookupDataCollectorManagement(id) { // List function list(req, res, next) { const filters = new FilterParser(req.query); + let dataCollector; const sql = `SELECT id, label, description, version_number, color, is_related_patient FROM data_collector_management`; @@ -38,7 +39,28 @@ function list(req, res, next) { db.exec(query, parameters) .then((rows) => { - res.status(200).json(rows); + dataCollector = rows; + + const getSubmission = ` + SELECT dcm.id, COUNT(dcm.id) AS number_submissions + FROM data_collector_management AS dcm + JOIN survey_data AS sd ON sd.data_collector_management_id = dcm.id + WHERE sd.is_deleted = 0 + GROUP BY dcm.id`; + + return db.exec(getSubmission); + }) + .then((submission) => { + dataCollector.forEach(collector => { + collector.number_submissions = 0; + submission.forEach(sub => { + if (collector.id === sub.id) { + collector.number_submissions = sub.number_submissions; + } + }); + }); + + res.status(200).json(dataCollector); }) .catch(next) .done(); From d9cdf0d4640a699dca356e29b90cdc4f1d972fa9 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:47:15 +0100 Subject: [PATCH 14/30] Rebase with branch Master --- client/src/i18n/en/tree.json | 2 +- client/src/i18n/fr/tree.json | 2 +- test/integration/dataCollectorManagement.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index 2894325f9b..1118ecbb81 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -31,7 +31,7 @@ "CURRENCY" : "Currency", "DATA_COLLECTION": "Data Collection", "DATA_COLLECTOR_MANAGEMENT": "Data Collector Management", - "DATA_KIT": "Data collection kit", + "DATA_KIT": ".Data collection kit", "DATA_KIT_REPORT": "Data Collection Kit Report", "DEPARTMENT_MANAGEMENT" : "Department Management", "DEBTOR_GROUP" : "Debtor Group Management", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index 0dfdea0926..409bee97d9 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -31,7 +31,7 @@ "CURRENCY":"Monnaie", "DATA_COLLECTION": "Collecte de données", "DATA_COLLECTOR_MANAGEMENT": "Gestion des collecteurs de données", - "DATA_KIT": "Kit de collecte de données", + "DATA_KIT": ".Kit de collecte de données", "DATA_KIT_REPORT": "Rapport des collectes des données", "DEPARTMENT_MANAGEMENT" : "Gestion des Departements", "DEBTOR_GROUP":"Gestion des Groupes Débiteurs", diff --git a/test/integration/dataCollectorManagement.js b/test/integration/dataCollectorManagement.js index def311e006..9a942a2aa4 100644 --- a/test/integration/dataCollectorManagement.js +++ b/test/integration/dataCollectorManagement.js @@ -56,7 +56,7 @@ describe('(/data_collector_management) Data Collector Management', () => { .then((res) => { helpers.api.listed(res, numDataCollector); expect(res.body[0]).to.have.all.keys('id', 'label', 'description', - 'version_number', 'color', 'is_related_patient'); + 'version_number', 'color', 'is_related_patient', 'number_submissions'); }) .catch(helpers.handler); }); From ce41297b72b0e97b6a642cd838563a24117a43dd Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Thu, 12 Sep 2019 14:46:24 +0100 Subject: [PATCH 15/30] refactor(Download PDF) - Improve display metadata, reduice the function downloadD - avoid apostrophes in the search parameter --- client/src/modules/display_metadata/display_metadata.html | 8 +------- client/src/modules/display_metadata/display_metadata.js | 8 +++++++- .../modules/survey_form/modals/survey_form.modals.html | 2 +- server/controllers/admin/displayMetadata.js | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/client/src/modules/display_metadata/display_metadata.html b/client/src/modules/display_metadata/display_metadata.html index 3ad216c951..e7f52d9490 100644 --- a/client/src/modules/display_metadata/display_metadata.html +++ b/client/src/modules/display_metadata/display_metadata.html @@ -15,13 +15,7 @@
-
+
{ if (key === element.surveyName) { + // This is a hack to avoid apostrophes in the search parameter + findParameters[key] = findParameters[key].replace(`'`, `''`); + if (element.type === '1') { filterCondition += ` ${element.surveyName} = '${findParameters[key]}' ${andCondition}`; } else if (element.type === '2' || element.type === '7' || element.type === '9') { From 944a6c53e386c8fce352bac491547c2d6897700f Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Mon, 16 Sep 2019 10:21:55 +0100 Subject: [PATCH 16/30] refactor(Data Collector) - Added the listHint property to display information about the component selection lists bhChoiceListMultipleSelect and bhChoiceListSelect - Using function downloadPDF and Using an object instead of a function with multiple parameters - Using Mao from the survey array for mere efficient --- .../components/bhChoiceListMultipleSelect.js | 1 + .../src/js/components/bhChoiceListSelect.js | 1 + .../display_metadata/display_metadata.html | 78 ++++++++++--------- .../display_metadata/display_metadata.js | 20 ++++- .../display_metadata.service.js | 54 +++++++------ .../display_metadata/modals/search.modal.html | 2 + .../display_metadata/modals/search.modal.js | 3 +- .../fill_form/modals/fill_form.modals.html | 5 +- .../bhChoiceListMultipleSelect.tmpl.html | 2 +- .../templates/bhChoiceListSelect.tmpl.html | 2 +- server/controllers/admin/displayMetadata.js | 6 +- .../controllers/admin/metadataReport/index.js | 1 + 12 files changed, 100 insertions(+), 75 deletions(-) diff --git a/client/src/js/components/bhChoiceListMultipleSelect.js b/client/src/js/components/bhChoiceListMultipleSelect.js index f695147a0e..b01fd7475c 100644 --- a/client/src/js/components/bhChoiceListMultipleSelect.js +++ b/client/src/js/components/bhChoiceListMultipleSelect.js @@ -8,6 +8,7 @@ angular.module('bhima.components') label : '@?', required : '
-
- -
+
+
+ + + + + +
+
+
+ +
-
- +
+ +
diff --git a/client/src/modules/display_metadata/display_metadata.js b/client/src/modules/display_metadata/display_metadata.js index 8a88447bd1..785316969a 100644 --- a/client/src/modules/display_metadata/display_metadata.js +++ b/client/src/modules/display_metadata/display_metadata.js @@ -26,11 +26,12 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem vm.onRemove = onRemove; vm.displayData = displayData; vm.patient = {}; + vm.options = {}; vm.downloadPDF = function downloadPDF() { - vm.patient.uuid = vm.patient ? vm.patient.uuid : ''; + vm.options.renderer = 'pdf'; - return DisplayMetadata.download('pdf', vm.changes, vm.collectorId, vm.filterElements, vm.patient.uuid, vm.patient); + return DisplayMetadata.download(vm.options); }; const cache = new AppCache('display_metadata'); @@ -130,6 +131,12 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem .then((survey) => { vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + vm.options = { + changes : vm.changes, + data_collector_management_id : vm.collectorId, + filterClient : vm.filterElements, + }; + vm.params = { data_collector_management_id : vm.collectorId, changes : vm.changes, @@ -179,6 +186,15 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem }) .then((survey) => { vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + + vm.options = { + changes : vm.changes, + data_collector_management_id : vm.collectorId, + filterClient : vm.filterElements, + patient_uuid : vm.patient.uuid, + patient : vm.patient, + }; + }) .catch(handleError) .finally(toggleLoadingIndicator); diff --git a/client/src/modules/display_metadata/display_metadata.service.js b/client/src/modules/display_metadata/display_metadata.service.js index ee82796b48..95012ffb9f 100644 --- a/client/src/modules/display_metadata/display_metadata.service.js +++ b/client/src/modules/display_metadata/display_metadata.service.js @@ -18,16 +18,16 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial service.displayFilters = displayFilters; service.download = download; - function download(type, changes, id, filterClient, patientUuid, patient) { + function download(opts) { const options = { - renderer : type, - changes, + renderer : opts.renderer, + changes : opts.changes, lang : Languages.key, - patient_uuid : patientUuid || null, + patient_uuid : opts.patient_uuid, downloadMode : true, - data_collector_management_id : id, - filterClient, - patient, + data_collector_management_id : opts.data_collector_management_id, + filterClient : opts.filterClient, + patient : opts.patient, }; // return serialized options @@ -35,7 +35,7 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial } function listSurveyformtype() { - const url = ''.concat('listSurveyformtype'); + const url = 'listSurveyformtype'; return Api.read.call(service, url); } @@ -60,6 +60,7 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial function displayFilters(survey, search) { let filters = ``; + const surveyMap = new Map(survey.map(item => ([item.name, item]))); const dateLabel = $translate.instant('FORM.LABELS.DATE'); if (search.searchDateFrom) { @@ -71,23 +72,21 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`; } - survey.forEach(item => { - if (item.name === key) { - filters += ` // ( ${item.label} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} - - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`; - } - }); + const item = surveyMap.get(key); + if (item) { + filters += ` // ( ${item.label} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} + - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`; + } }); } } if (search.loggedChanges) { search.loggedChanges.forEach(element => { - survey.forEach(item => { - if (item.name === element.key) { - filters += ` // ${item.label} : ${element.value} `; - } - }); + const item = surveyMap.get(element.key); + if (item) { + filters += ` // ${item.label} : ${element.value} `; + } }); } @@ -95,16 +94,15 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial const multipleChoiceLength = Object.keys(search.multipleChoice).length; if (multipleChoiceLength) { Object.keys(search.multipleChoice).forEach((key) => { - survey.forEach(item => { - if (item.name === key) { - let multiChoice = ''; - for (let i = 0; i < search.multipleChoice[key].length; i++) { - multiChoice += ` ${search.multipleChoice[key][i]}, `; - } - - filters += ` // ${item.label} : ( ${multiChoice} )`; + const item = surveyMap.get(key); + if (item) { + let multiChoice = ''; + for (let i = 0; i < search.multipleChoice[key].length; i++) { + multiChoice += ` ${search.multipleChoice[key][i]}, `; } - }); + + filters += ` // ${item.label} : ( ${multiChoice} )`; + } }); } } diff --git a/client/src/modules/display_metadata/modals/search.modal.html b/client/src/modules/display_metadata/modals/search.modal.html index bf838168ae..7ec553d68d 100644 --- a/client/src/modules/display_metadata/modals/search.modal.html +++ b/client/src/modules/display_metadata/modals/search.modal.html @@ -73,6 +73,7 @@ list="$ctrl.searchQueries[formItem.name]" name="{{ formItem.name }}" list-label="{{ formItem.label }}" + list-hint="{{ formItem.hint }}" group-label="formItem.choice_list_id" on-select-callback="$ctrl.onSelectList(list, formItem.name)"> @@ -88,6 +89,7 @@ name="{{ formItem.name }}" required="formItem.valueRequired" list-label="{{ formItem.label }}" + list-hint="{{ formItem.hint }}" group-label="formItem.choice_list_id" on-change="$ctrl.onSelectMultiple(lists, formItem.name)"> diff --git a/client/src/modules/display_metadata/modals/search.modal.js b/client/src/modules/display_metadata/modals/search.modal.js index 48d93d95f9..5fdb089d2b 100644 --- a/client/src/modules/display_metadata/modals/search.modal.js +++ b/client/src/modules/display_metadata/modals/search.modal.js @@ -52,7 +52,7 @@ function DisplayMetadataSearchModalController( return ChoicesList.read(); }) .then(choicesLists => { - vm.choicsLists = choicesLists; + vm.choicesLists = choicesLists; }) .catch(Notify.handleError); } @@ -80,6 +80,7 @@ function DisplayMetadataSearchModalController( } }); + const multipleChoiceLength = Object.keys(vm.multipleChoice).length; if (multipleChoiceLength) { Object.keys(vm.multipleChoice).forEach((key) => { diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index 6128c04f65..df504ccbe8 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -157,7 +157,6 @@
- {{ formItem.hint }} name="{{ formItem.name }}" required="formItem.valueRequired" list-label="{{ formItem.label }}" + list-hint="{{ formItem.hint }}" group-label="formItem.choice_list_id" on-select-callback="FillFormModalCtrl.onSelectList(list, formItem.name)"> @@ -176,6 +176,7 @@
list="FillFormModalCtrl.form[formItem.name]" required="formItem.valueRequired" list-label="{{ formItem.label }}" + list-hint="{{ formItem.hint }}" parent-id="FillFormModalCtrl.form[formItem.filterLabel]" group-label="formItem.choice_list_id" on-select-callback="FillFormModalCtrl.onSelectList(list, formItem.name)"> @@ -186,7 +187,6 @@
- {{ formItem.hint }} name="{{ formItem.name }}" required="formItem.valueRequired" list-label="{{ formItem.label }}" + list-hint="{{ formItem.hint }}" group-label="formItem.choice_list_id" on-change="FillFormModalCtrl.onSelectMultiple(lists, formItem.name)"> diff --git a/client/src/modules/templates/bhChoiceListMultipleSelect.tmpl.html b/client/src/modules/templates/bhChoiceListMultipleSelect.tmpl.html index d1a19d27d3..e9709cc68d 100644 --- a/client/src/modules/templates/bhChoiceListMultipleSelect.tmpl.html +++ b/client/src/modules/templates/bhChoiceListMultipleSelect.tmpl.html @@ -15,7 +15,7 @@ close-on-select="false" ng-required="$ctrl.required"> - + {{ $item.label }} diff --git a/client/src/modules/templates/bhChoiceListSelect.tmpl.html b/client/src/modules/templates/bhChoiceListSelect.tmpl.html index 99d3e8dc39..6b8ea3a99a 100644 --- a/client/src/modules/templates/bhChoiceListSelect.tmpl.html +++ b/client/src/modules/templates/bhChoiceListSelect.tmpl.html @@ -14,7 +14,7 @@ ng-model= "$ctrl.list" ng-required="$ctrl.required" on-select="$ctrl.onSelect($item, $model)"> - + {{ $select.selected.label }} { if (key === element.surveyName) { - // This is a hack to avoid apostrophes in the search parameter - findParameters[key] = findParameters[key].replace(`'`, `''`); + // if (findParameters[key]) { + // // This is a hack to avoid apostrophes in the search parameter + // findParameters[key] = findParameters[key].replace(`'`, `''`); + // } if (element.type === '1') { filterCondition += ` ${element.surveyName} = '${findParameters[key]}' ${andCondition}`; diff --git a/server/controllers/admin/metadataReport/index.js b/server/controllers/admin/metadataReport/index.js index db3c449b7b..851b3cd880 100644 --- a/server/controllers/admin/metadataReport/index.js +++ b/server/controllers/admin/metadataReport/index.js @@ -162,6 +162,7 @@ function reportMetadata(req, res, next) { let report; const options = { + orientation : 'landscape', footerRight : '[page] / [toPage]', lang : req.query.lang, renderer : req.query.renderer, From 17169e883c89ac5565657c6321525a484083cc7f Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Mon, 16 Sep 2019 16:12:30 +0100 Subject: [PATCH 17/30] Improve and sanitaze code --- .../display_metadata/display_metadata.html | 14 +++---- .../display_metadata/display_metadata.js | 41 +++++++++++++------ .../display_metadata.service.js | 17 ++++---- .../display_metadata/modals/search.modal.html | 2 +- .../display_metadata/modals/search.modal.js | 2 + 5 files changed, 47 insertions(+), 29 deletions(-) diff --git a/client/src/modules/display_metadata/display_metadata.html b/client/src/modules/display_metadata/display_metadata.html index a92d2cecd4..8e29385af0 100644 --- a/client/src/modules/display_metadata/display_metadata.html +++ b/client/src/modules/display_metadata/display_metadata.html @@ -20,7 +20,6 @@ - .$dirty - Sanitaze and Clear Code --- .../components/bhChoiceListMultipleSelect.js | 2 +- .../src/js/components/bhChoiceListSelect.js | 2 +- .../account_reference.modal.js | 4 +-- .../modals/account_reference_type.modal.js | 4 +-- .../modules/accounts/edit/accounts.edit.js | 2 +- .../modals/break_even_reference.modal.js | 4 +-- .../modals/choices_list_management.modals.js | 4 +-- .../templates/action.cell.tmpl.html | 2 +- .../templates/gridLabels.tmpl.html | 2 +- .../templates/gridName.tmpl.html | 2 +- .../data_collector_management.modals.html | 26 ++++++++----------- .../data_collector_management.modals.js | 6 ++--- .../templates/action.cell.html | 2 +- .../templates/action.cell.html | 2 +- .../fill_form/modals/fill_form.modals.js | 6 ++--- .../modules/services/modals/service.modal.js | 4 +-- .../survey_form/modals/survey_form.modals.js | 6 ++--- .../survey_form/templates/action.cell.html | 2 +- .../modules/users/UserEditPasswordModal.js | 2 +- 19 files changed, 40 insertions(+), 44 deletions(-) diff --git a/client/src/js/components/bhChoiceListMultipleSelect.js b/client/src/js/components/bhChoiceListMultipleSelect.js index b01fd7475c..643dd7b6e2 100644 --- a/client/src/js/components/bhChoiceListMultipleSelect.js +++ b/client/src/js/components/bhChoiceListMultipleSelect.js @@ -11,7 +11,7 @@ angular.module('bhima.components') listHint : '@?', isTitle : '
  • - {{row.entity.label}} + {{row.entity.label}}
  • diff --git a/client/src/modules/choices_list_management/templates/gridLabels.tmpl.html b/client/src/modules/choices_list_management/templates/gridLabels.tmpl.html index e97f4e2e16..19466a734c 100644 --- a/client/src/modules/choices_list_management/templates/gridLabels.tmpl.html +++ b/client/src/modules/choices_list_management/templates/gridLabels.tmpl.html @@ -2,7 +2,7 @@ {{ row.entity.label}} - + {{ row.entity.label}} {{ row.entity.label}} - + {{ row.entity.name}}
    \ No newline at end of file diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html index b022321086..de22e6125b 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -25,27 +25,23 @@
    -
    - -
    -
    -
    + +
    +
    -
    - -
    -
    -
    + +
    +
    diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.js b/client/src/modules/data_collector_management/modals/data_collector_management.modals.js index dc8ca34467..f0f4d85d27 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.js +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.js @@ -11,7 +11,7 @@ DataCollectorManagementModalController.$inject = [ function DataCollectorManagementModalController($state, DataCollectorManagement, Notify, AppCache, Color) { const vm = this; - const cache = AppCache('AccountReferenceModal'); + const cache = AppCache('DataCollectorManagementModal'); vm.dataCollector = {}; vm.stateParams = {}; @@ -49,7 +49,7 @@ function DataCollectorManagementModalController($state, DataCollectorManagement, function submit(dataCollectorManagementForm) { vm.hasNoChange = dataCollectorManagementForm.$submitted && dataCollectorManagementForm.$pristine && !vm.isCreating; if (dataCollectorManagementForm.$invalid) { return null; } - if (!dataCollectorManagementForm.$dirty) { return null; } + if (dataCollectorManagementForm.$pristine) { return null; } const promise = (vm.isCreating) ? DataCollectorManagement.create(vm.dataCollector) @@ -69,6 +69,6 @@ function DataCollectorManagementModalController($state, DataCollectorManagement, } function closeModal() { - $state.transitionTo('data_collector_management'); + $state.go('data_collector_management'); } } diff --git a/client/src/modules/data_collector_management/templates/action.cell.html b/client/src/modules/data_collector_management/templates/action.cell.html index 0ba1f5fe49..9580b0e10d 100644 --- a/client/src/modules/data_collector_management/templates/action.cell.html +++ b/client/src/modules/data_collector_management/templates/action.cell.html @@ -6,7 +6,7 @@
    • - {{row.entity.label}} + {{row.entity.label}}
    • diff --git a/client/src/modules/display_metadata/templates/action.cell.html b/client/src/modules/display_metadata/templates/action.cell.html index c968a57f44..48aa522b5c 100644 --- a/client/src/modules/display_metadata/templates/action.cell.html +++ b/client/src/modules/display_metadata/templates/action.cell.html @@ -6,7 +6,7 @@
      • - {{row.entity.label}} + {{row.entity.label}}
      • diff --git a/client/src/modules/fill_form/modals/fill_form.modals.js b/client/src/modules/fill_form/modals/fill_form.modals.js index 43c8573931..6186478b8e 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.js +++ b/client/src/modules/fill_form/modals/fill_form.modals.js @@ -168,7 +168,7 @@ function FillFormModalController($state, FillForm, Notify, AppCache, function submit(fillForm) { vm.hasNoChange = fillForm.$submitted && fillForm.$pristine && !vm.isCreating; if (fillForm.$invalid) { return null; } - if (!fillForm.$dirty) { return null; } + if (fillForm.$pristine) { return null; } vm.form.data_collector_management_id = vm.stateParams.id; if (vm.stateParams.patient) { @@ -220,9 +220,9 @@ function FillFormModalController($state, FillForm, Notify, AppCache, } function closeModal() { - const transitionTo = vm.updateMode ? 'display_metadata' : 'fill_form'; + const url = vm.updateMode ? 'display_metadata' : 'fill_form'; if (!vm.stateParams.patient) { - $state.transitionTo(transitionTo); + $state.go(url); } else if (vm.stateParams.patient) { $state.go('display_metadata.patient', { id : vm.stateParams.id, patient : vm.stateParams.patient }); } diff --git a/client/src/modules/services/modals/service.modal.js b/client/src/modules/services/modals/service.modal.js index d67b207d2d..8d6f969092 100644 --- a/client/src/modules/services/modals/service.modal.js +++ b/client/src/modules/services/modals/service.modal.js @@ -29,7 +29,7 @@ function ServiceModalController($state, Services, Depots, $translate, // submit the data to the server from all two forms (update, create) function submit(serviceForm) { - if (serviceForm.$invalid || !serviceForm.$dirty) { return 0; } + if (serviceForm.$invalid || serviceForm.$pristine) { return 0; } const promise = (vm.isCreating) ? Services.create(vm.service) @@ -45,6 +45,6 @@ function ServiceModalController($state, Services, Depots, $translate, } function closeModal() { - $state.transitionTo('services'); + $state.go('services'); } } diff --git a/client/src/modules/survey_form/modals/survey_form.modals.js b/client/src/modules/survey_form/modals/survey_form.modals.js index 0e412858b3..0a323de491 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.js +++ b/client/src/modules/survey_form/modals/survey_form.modals.js @@ -11,7 +11,7 @@ SurveyFormModalController.$inject = [ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCollectorManagement) { const vm = this; - const cache = AppCache('AccountReferenceModal'); + const cache = AppCache('SurveyFormModal'); vm.surveyForm = {}; vm.stateParams = {}; @@ -79,7 +79,7 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol function submit(surveyForm) { vm.hasNoChange = surveyForm.$submitted && surveyForm.$pristine && !vm.isCreating; if (surveyForm.$invalid) { return null; } - if (!surveyForm.$dirty) { return null; } + if (surveyForm.$pristine) { return null; } if (parseInt(vm.surveyForm.type, 10) !== 9) { vm.surveyForm.calculation = null; @@ -103,6 +103,6 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol } function closeModal() { - $state.transitionTo('survey_form'); + $state.go('survey_form'); } } diff --git a/client/src/modules/survey_form/templates/action.cell.html b/client/src/modules/survey_form/templates/action.cell.html index 0ba1f5fe49..9580b0e10d 100644 --- a/client/src/modules/survey_form/templates/action.cell.html +++ b/client/src/modules/survey_form/templates/action.cell.html @@ -6,7 +6,7 @@
        • - {{row.entity.label}} + {{row.entity.label}}
        • diff --git a/client/src/modules/users/UserEditPasswordModal.js b/client/src/modules/users/UserEditPasswordModal.js index 19a9707f68..1e9a4c507e 100644 --- a/client/src/modules/users/UserEditPasswordModal.js +++ b/client/src/modules/users/UserEditPasswordModal.js @@ -25,7 +25,7 @@ function UsersPasswordModalController($state, Users, Notify) { // submits the password form function submit(passwordForm) { if (passwordForm.$invalid) { return; } - if (!passwordForm.$dirty || !validPassword()) { return; } + if (passwordForm.$pristine || !validPassword()) { return; } // try to update the user's password return Users.updatePassword($state.params.id, { password : vm.user.password }) From 2a9a36fdea2c0cca911cd59321e4cfe7b5c58ef9 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 20 Sep 2019 11:17:56 +0100 Subject: [PATCH 21/30] refactor(Bhima Data Collector) - Improved form selection component, added disable option when viewing patient data - Reformated the research params by the using of components bh-filters - Improved data display module, removal of entangled requests in the controller - --- .../src/js/components/bhSurveyFormSelect.js | 10 ++ .../display_metadata/display_metadata.html | 29 ++-- .../display_metadata/display_metadata.js | 109 ++++++++++---- .../display_metadata.service.js | 140 +++++++++++++----- .../display_metadata/modals/search.modal.html | 3 +- .../display_metadata/modals/search.modal.js | 19 ++- .../fill_form/modals/fill_form.modals.html | 2 +- .../reports/generate/dataKit/dataKit.html | 2 +- .../templates/bhSurveyFormSelect.tmpl.html | 3 +- server/controllers/admin/displayMetadata.js | 50 ++++--- .../controllers/admin/metadataReport/index.js | 9 +- .../metadataReport/metadataReport.handlebars | 11 +- 12 files changed, 267 insertions(+), 120 deletions(-) diff --git a/client/src/js/components/bhSurveyFormSelect.js b/client/src/js/components/bhSurveyFormSelect.js index 611c8ecf1b..d8729fc58b 100644 --- a/client/src/js/components/bhSurveyFormSelect.js +++ b/client/src/js/components/bhSurveyFormSelect.js @@ -7,6 +7,7 @@ angular.module('bhima.components') form : ' { + if (changes.form.currentValue) { + $ctrl.form = parseInt(changes.form.currentValue, 10); + } + }; + + // fires the onSelectCallback bound to the component + $ctrl.handleChange = form => $ctrl.onChange({ form }); + // fires the onSelectCallback bound to the component boundary $ctrl.onSelect = surveyForm => { $ctrl.onSelectCallback({ surveyForm }); diff --git a/client/src/modules/display_metadata/display_metadata.html b/client/src/modules/display_metadata/display_metadata.html index 8e29385af0..048f02bb17 100644 --- a/client/src/modules/display_metadata/display_metadata.html +++ b/client/src/modules/display_metadata/display_metadata.html @@ -75,27 +75,18 @@
          - - - {{ DisplayMetadataCtrl.collector.label }} +
          + + + FORM.LABELS.PATIENT_NAME :{{ DisplayMetadataCtrl.patient.display_name }}/{{ DisplayMetadataCtrl.patient.reference}} + - - - - - {{ DisplayMetadataCtrl.filterElements }} - - - - - - - - - :{{ DisplayMetadataCtrl.patient.display_name }}/{{ DisplayMetadataCtrl.patient.reference}} - - + + +
          diff --git a/client/src/modules/display_metadata/display_metadata.js b/client/src/modules/display_metadata/display_metadata.js index 3a13e9208e..a059f6ffc5 100644 --- a/client/src/modules/display_metadata/display_metadata.js +++ b/client/src/modules/display_metadata/display_metadata.js @@ -23,14 +23,20 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem vm.search = search; vm.collector = {}; vm.changes = {}; - vm.onRemove = onRemove; vm.displayData = displayData; vm.patient = {}; vm.options = {}; + vm.onRemoveFilter = onRemoveFilter; + + vm.filterElements = { + defaultFilters : [], + customFilters : [], + }; + + vm.filterElements.defaultFilters = []; vm.downloadPDF = function downloadPDF() { vm.options.renderer = 'pdf'; - return DisplayMetadata.download(vm.options); }; @@ -103,6 +109,17 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem }); } + // remove a filter with from the filter object, save the filters and reload + function onRemoveFilter(key) { + + vm.changes = DisplayMetadata.removeFilters(key, vm.changes); + vm.filterElements.defaultFilters = []; + vm.filterElements.customFilters = []; + + cache.changes = vm.changes; + loadGrid(); + } + function handleError(error) { vm.hasError = true; Notify.handleError(error); @@ -135,16 +152,18 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem SurveyForm.read(null, { data_collector_management_id : vm.collectorId }) .then((survey) => { - vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + vm.filterElements.customFilters = DisplayMetadata.displayFilters(survey, vm.changes); vm.options = { changes : vm.changes, data_collector_management_id : vm.collectorId, - filterClient : vm.filterElements, + filterClient : vm.filterElements.customFilters, }; - - return DisplayMetadata.read(null, vm.params); }) + .catch(handleError) + .finally(toggleLoadingIndicator); + + DisplayMetadata.read(null, vm.params) .then((data) => { data.columns.forEach(item => { if (item.field === 'dateSurvey') { @@ -155,13 +174,27 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem vm.gridOptions.columnDefs = data.columns; vm.gridOptions.data = data.surveyData; - - return DataCollectorManagement.read(vm.collectorId); }) + .catch(handleError) + .finally(toggleLoadingIndicator); + + DataCollectorManagement.read(vm.collectorId) .then((collector) => { cache.collector = collector; cache.changes = vm.changes; vm.collector = collector; + + vm.filterElements.defaultFilters.push( + { + _key : 'form_name', + _label : 'FORM.LABELS.FORM', + _displayValue : vm.collector.label, + _isCacheable : true, + _isDefault : true, + displayValue : vm.collector.label, + comparitorLabel : ':', + } + ); }) .catch(handleError) .finally(toggleLoadingIndicator); @@ -185,23 +218,40 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem item.aggregationHideLabel = true; } }); - vm.gridOptions.columnDefs = data.columns; vm.gridOptions.data = data.surveyData; + }) + .catch(handleError) + .finally(toggleLoadingIndicator); - return Patients.read($state.params.patient); + DataCollectorManagement.read($state.params.id) + .then((collector) => { + vm.collector = collector; + vm.filterElements.defaultFilters.push( + { + _key : 'form_name', + _label : 'FORM.LABELS.FORM', + _displayValue : vm.collector.label, + _isCacheable : true, + _isDefault : true, + displayValue : vm.collector.label, + comparitorLabel : ':', + } + ); }) + .catch(handleError) + .finally(toggleLoadingIndicator); + + Patients.read($state.params.patient) .then((patient) => { vm.patient = patient; - return DataCollectorManagement.read($state.params.id); - }) - .then((collector) => { - vm.collector = collector; - return SurveyForm.read(null, { data_collector_management_id : vm.collectorId }); }) - .then((survey) => { - vm.filterElements = DisplayMetadata.displayFilters(survey, vm.changes); + .catch(handleError) + .finally(toggleLoadingIndicator); + SurveyForm.read(null, { data_collector_management_id : vm.collectorId }) + .then((survey) => { + vm.filterElements.customFilters = DisplayMetadata.displayFilters(survey, vm.changes); vm.options = { changes : vm.changes, data_collector_management_id : vm.collectorId, @@ -209,11 +259,11 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem patient_uuid : vm.patient.uuid, patient : vm.patient, }; - }) .catch(handleError) .finally(toggleLoadingIndicator); } + } function toggleLoadingIndicator() { @@ -222,21 +272,24 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem // search Metadata of survey function search() { - DisplayMetadata.openSearchModal() + // Prevent the changement of form when hasPatientData is true + const params = { + data_collector_management_id : vm.collectorId, + hasPatientData : vm.hasPatientData, + }; + + DisplayMetadata.openSearchModal(params) .then((changes) => { - vm.collectorId = changes.collectorId; - vm.changes = changes; + if (changes) { + vm.collectorId = changes.collectorId; + vm.changes = changes; + } + + vm.filterElements.defaultFilters = []; loadGrid(); }); } - // On Remove all filter; - function onRemove() { - vm.changes = {}; - cache.changes = {}; - loadGrid(); - } - function displayData(dataUuid) { Receipts.displayData(dataUuid, vm.patient, true); } diff --git a/client/src/modules/display_metadata/display_metadata.service.js b/client/src/modules/display_metadata/display_metadata.service.js index bade404784..db362c0a0b 100644 --- a/client/src/modules/display_metadata/display_metadata.service.js +++ b/client/src/modules/display_metadata/display_metadata.service.js @@ -17,6 +17,7 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial service.openSearchModal = openSearchModal; service.displayFilters = displayFilters; service.download = download; + service.removeFilters = removeFilters; function download(opts) { const options = { @@ -59,56 +60,129 @@ function DisplayMetadataService(Api, Modal, moment, $translate, $httpParamSerial } function displayFilters(survey, search) { - const filters = []; + const surveyMap = new Map(survey.map(item => ([item.name, item]))); const dateLabel = $translate.instant('FORM.LABELS.DATE'); + const customFilters = []; - if (search.searchDateFrom) { - const dateFromLength = Object.keys(search.searchDateFrom).length; - if (dateFromLength) { - Object.keys(search.searchDateFrom).forEach((key) => { - if (key === 'dateSurvey') { - filters.push(`// ( ${dateLabel} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} - - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`); - } + if (search) { + if (search.searchDateFrom) { + const dateFromLength = Object.keys(search.searchDateFrom).length; + if (dateFromLength) { + Object.keys(search.searchDateFrom).forEach((key) => { + if (key === 'dateSurvey') { + const formatDateFrom = moment(search.searchDateFrom[key]).format('DD MMM YYYY'); + const formatDateTo = moment(search.searchDateTo[key]).format('DD MMM YYYY'); + const dateFilters = `[${formatDateFrom} - ${formatDateTo}]`; + + customFilters.push( + { + _key : 'dateSurvey', + _label : dateLabel, + _displayValue : dateFilters, + _isCacheable : true, + displayValue : dateFilters, + comparitorLabel : ':', + } + ); + } - const item = surveyMap.get(key); + const item = surveyMap.get(key); + if (item) { + const formatDateFrom = moment(search.searchDateFrom[key]).format('DD MMM YYYY'); + const formatDateTo = moment(search.searchDateTo[key]).format('DD MMM YYYY'); + const dateFormats = `[${formatDateFrom} - ${formatDateTo}]`; + + customFilters.push( + { + _key : key, + _label : item.label, + _displayValue : dateFormats, + _isCacheable : true, + displayValue : dateFormats, + comparitorLabel : ':', + } + ); + } + }); + } + } + + if (search.loggedChanges) { + search.loggedChanges.forEach(element => { + const item = surveyMap.get(element.key); if (item) { - filters.push(` // ( ${item.label} [${moment(search.searchDateFrom[key]).format('DD MMM YYYY')} - - ${moment(search.searchDateTo[key]).format('DD MMM YYYY')}])`); + customFilters.push( + { + _key : item.name, + _label : item.label, + _displayValue : element.value, + _isCacheable : true, + displayValue : element.value, + comparitorLabel : ':', + } + ); } }); } + + if (search.multipleChoice) { + const multipleChoiceLength = Object.keys(search.multipleChoice).length; + if (multipleChoiceLength) { + Object.keys(search.multipleChoice).forEach((key) => { + const item = surveyMap.get(key); + if (item) { + let multiChoice = ''; + for (let i = 0; i < search.multipleChoice[key].length; i++) { + multiChoice += ` ${search.multipleChoice[key][i]}; `; + } + + customFilters.push( + { + _key : key, + _label : item.label, + _displayValue : multiChoice, + _isCacheable : true, + displayValue : multiChoice, + comparitorLabel : ':', + } + ); + } + }); + } + } } - if (search.loggedChanges) { - search.loggedChanges.forEach(element => { - const item = surveyMap.get(element.key); - if (item) { - filters.push(` // ${item.label} : ${element.value} `); + return customFilters; + } + + function removeFilters(key, filters) { + if (filters.loggedChanges) { + filters.loggedChanges.forEach((item, index) => { + if (key === item.key) { + filters.loggedChanges.splice(index, 1); } }); } - if (search.multipleChoice) { - const multipleChoiceLength = Object.keys(search.multipleChoice).length; - if (multipleChoiceLength) { - Object.keys(search.multipleChoice).forEach((key) => { - const item = surveyMap.get(key); - if (item) { - let multiChoice = ''; - for (let i = 0; i < search.multipleChoice[key].length; i++) { - multiChoice += ` ${search.multipleChoice[key][i]}, `; - } + if (filters.searchDateFrom) { + Object.keys(filters.searchDateFrom).forEach((keyfilters) => { + if (key === keyfilters) { + delete filters.searchDateFrom[keyfilters]; + delete filters.searchDateTo[keyfilters]; + } + }); + } - filters.push(` // ${item.label} : ( ${multiChoice} )`); - } - }); - } + if (filters.multipleChoice) { + Object.keys(filters.multipleChoice).forEach((keyfilters) => { + if (key === keyfilters) { + delete filters.multipleChoice[keyfilters]; + } + }); } - const filtersElememts = filters.length ? filters.join(' ') : ``; - return filtersElememts; + return filters; } return service; diff --git a/client/src/modules/display_metadata/modals/search.modal.html b/client/src/modules/display_metadata/modals/search.modal.html index e6c09a1703..8b0b343d0c 100644 --- a/client/src/modules/display_metadata/modals/search.modal.html +++ b/client/src/modules/display_metadata/modals/search.modal.html @@ -13,6 +13,7 @@ id="form" form="$ctrl.searchQueries.data_collector_id" name="dataCollectorId" + disabled="$ctrl.disabled" on-select-callback="$ctrl.onSelectSurveyForm(surveyForm)" required="true"> @@ -44,7 +45,7 @@
          -
          +
          diff --git a/client/src/modules/display_metadata/modals/search.modal.js b/client/src/modules/display_metadata/modals/search.modal.js index 3407c22a96..c7e5ec8678 100644 --- a/client/src/modules/display_metadata/modals/search.modal.js +++ b/client/src/modules/display_metadata/modals/search.modal.js @@ -2,7 +2,7 @@ angular.module('bhima.controllers') .controller('DisplayMetadataSearchModalController', DisplayMetadataSearchModalController); DisplayMetadataSearchModalController.$inject = [ - '$uibModalInstance', 'Store', 'SurveyFormService', 'NotifyService', 'AppCache', 'ChoicesListManagementService', + '$uibModalInstance', 'Store', 'SurveyFormService', 'NotifyService', 'AppCache', 'ChoicesListManagementService', 'filters', ]; /** @@ -14,9 +14,8 @@ DisplayMetadataSearchModalController.$inject = [ * preset by passing in a filters object using filtersProvider(). */ function DisplayMetadataSearchModalController( - ModalInstance, Store, SurveyForm, Notify, AppCache, ChoicesList - // ModalInstance, filters, Notify, Store, util, - // MultiplePayroll, Currencies, Payroll, $translate, Session + ModalInstance, Store, SurveyForm, Notify, AppCache, ChoicesList, filters + ) { const vm = this; vm.onSelectSurveyForm = onSelectSurveyForm; @@ -27,10 +26,17 @@ function DisplayMetadataSearchModalController( vm.multipleChoice = {}; vm.onSelectList = onSelectList; vm.onSelectMultiple = onSelectMultiple; + vm.disabled = false; + + const cache = new AppCache('display_metadata_search'); - const cache = new AppCache('display_metadata'); + if (filters) { + if (filters.hasPatientData) { + vm.disabled = true; + } - if (Object.keys(cache).length) { + onSelectSurveyForm({ id : filters.data_collector_management_id }); + } else if (Object.keys(cache).length) { if (cache.collector.id) { onSelectSurveyForm(cache.collector); } @@ -82,7 +88,6 @@ function DisplayMetadataSearchModalController( } }); - const multipleChoiceLength = Object.keys(vm.multipleChoice).length; if (multipleChoiceLength) { Object.keys(vm.multipleChoice).forEach((key) => { diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index df504ccbe8..f81ea4b9a8 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -15,7 +15,7 @@

          {{ FillFormModalCtrl.dataCollector.label }}

          -

          {{ FillFormModalCtrl.patient.display_name }} / {{ FillFormModalCtrl.patient.reference}}

          +

          {{ FillFormModalCtrl.patient.display_name }} / {{ FillFormModalCtrl.patient.reference}} ({{ FillFormModalCtrl.patient.sex }})

          diff --git a/client/src/modules/reports/generate/dataKit/dataKit.html b/client/src/modules/reports/generate/dataKit/dataKit.html index 0a51d38c99..3b6efc4f3f 100644 --- a/client/src/modules/reports/generate/dataKit/dataKit.html +++ b/client/src/modules/reports/generate/dataKit/dataKit.html @@ -51,7 +51,7 @@

          TREE.DATA_KIT_REPORT

          -
          +
          diff --git a/client/src/modules/templates/bhSurveyFormSelect.tmpl.html b/client/src/modules/templates/bhSurveyFormSelect.tmpl.html index 60452e865f..e5e8206e89 100644 --- a/client/src/modules/templates/bhSurveyFormSelect.tmpl.html +++ b/client/src/modules/templates/bhSurveyFormSelect.tmpl.html @@ -13,7 +13,8 @@ name="form" ng-model="$ctrl.form" on-select="$ctrl.onSelect($item, $model)" - ng-required="$ctrl.required"> + ng-required="$ctrl.required" + ng-disabled="$ctrl.disabled"> {{$select.selected.label}} diff --git a/server/controllers/admin/displayMetadata.js b/server/controllers/admin/displayMetadata.js index c2eb3f16eb..61b24e5624 100644 --- a/server/controllers/admin/displayMetadata.js +++ b/server/controllers/admin/displayMetadata.js @@ -17,26 +17,28 @@ function lookupData(params) { let paramDateFrom = {}; let paramDateTo = {}; let paramsMultipleChoice = {}; + const findParameters = {}; - if (params.changes.searchDateFrom) { - paramDateFrom = params.changes.searchDateFrom; - } + if (params.changes) { + if (params.changes.searchDateFrom) { + paramDateFrom = params.changes.searchDateFrom; + } - if (params.changes.searchDateTo) { - paramDateTo = params.changes.searchDateTo; - } + if (params.changes.searchDateTo) { + paramDateTo = params.changes.searchDateTo; + } - if (params.changes.multipleChoice) { - paramsMultipleChoice = params.changes.multipleChoice; - } + if (params.changes.multipleChoice) { + paramsMultipleChoice = params.changes.multipleChoice; + } - const findParameters = {}; - if (params.changes.loggedChanges) { - params.changes.loggedChanges.forEach(item => { - if (item.key !== 'data_collector_id') { - findParameters[item.key] = item.value; - } - }); + if (params.changes.loggedChanges) { + params.changes.loggedChanges.forEach(item => { + if (item.key !== 'data_collector_id') { + findParameters[item.key] = item.value; + } + }); + } } const filters1 = new FilterParser(params, { tableAlias : 's' }); @@ -75,14 +77,16 @@ function lookupData(params) { surveyFormElement.forEach(element => { if (key === element.surveyName) { - // if (findParameters[key]) { - // // This is a hack to avoid apostrophes in the search parameter - // findParameters[key] = findParameters[key].replace(`'`, `''`); - // } - - if (element.type === '1') { + if (element.type === '1' || element.type === '9') { filterCondition += ` ${element.surveyName} = '${findParameters[key]}' ${andCondition}`; - } else if (element.type === '2' || element.type === '7' || element.type === '9') { + } else if ( + element.type === '2' || element.type === '7' || element.type === '10') { + const checkIfApostrophes = findParameters[key].indexOf('\''); + if (checkIfApostrophes !== (-1)) { + // This is a hack to avoid apostrophes in the search parameter + findParameters[key] = findParameters[key].replace(`'`, `''`); + } + filterCondition += ` ${element.surveyName} LIKE '%${findParameters[key]}%' ${andCondition}`; } else if (element.type === '3' || element.type === '4') { filterCondition += ` ${element.surveyName} = '${findParameters[key]}' ${andCondition}`; diff --git a/server/controllers/admin/metadataReport/index.js b/server/controllers/admin/metadataReport/index.js index 851b3cd880..3cc01515d0 100644 --- a/server/controllers/admin/metadataReport/index.js +++ b/server/controllers/admin/metadataReport/index.js @@ -100,7 +100,6 @@ function metadataCard(req, res, next) { function reportMetadata(req, res, next) { const params = req.query; - const filterQuery = []; if (!params.downloadMode) { @@ -151,10 +150,18 @@ function reportMetadata(req, res, next) { } } + if (params.filterClient) { + params.filterClient.forEach((item, index) => { + params.filterClient[index] = JSON.parse(item); + }); + } + + const data = {}; data.filterQuery = filterQuery; data.filterClient = params.filterClient; + if (typeof params.patient === 'string') { data.patient = JSON.parse(params.patient); } diff --git a/server/controllers/admin/metadataReport/metadataReport.handlebars b/server/controllers/admin/metadataReport/metadataReport.handlebars index 9e11ed0009..30914a8c52 100644 --- a/server/controllers/admin/metadataReport/metadataReport.handlebars +++ b/server/controllers/admin/metadataReport/metadataReport.handlebars @@ -57,13 +57,14 @@ {{ value }} {{/each}} + {{#each filterClient}} + + {{ _label }} + {{ displayValue }} + + {{/each}} -
          - - {{ filterClient }} - -
          From a53f1bfe7f419eee342f3bba7e0b21416b68651b Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 20 Sep 2019 11:37:10 +0100 Subject: [PATCH 22/30] Clear and Sanitaze Code --- client/src/modules/display_metadata/modals/search.modal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/modules/display_metadata/modals/search.modal.js b/client/src/modules/display_metadata/modals/search.modal.js index c7e5ec8678..c121dc3fa6 100644 --- a/client/src/modules/display_metadata/modals/search.modal.js +++ b/client/src/modules/display_metadata/modals/search.modal.js @@ -2,7 +2,8 @@ angular.module('bhima.controllers') .controller('DisplayMetadataSearchModalController', DisplayMetadataSearchModalController); DisplayMetadataSearchModalController.$inject = [ - '$uibModalInstance', 'Store', 'SurveyFormService', 'NotifyService', 'AppCache', 'ChoicesListManagementService', 'filters', + '$uibModalInstance', 'Store', 'SurveyFormService', 'NotifyService', 'AppCache', + 'ChoicesListManagementService', 'filters', ]; /** From da51a094aebdbcd831fd650140cf9f6c18d6e6fd Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 15 Oct 2019 13:52:04 +0100 Subject: [PATCH 23/30] Rebase with branch master --- client/src/i18n/en/tree.json | 3 +- client/src/i18n/fr/tree.json | 4 +- .../data_collector_management.html | 2 +- .../data_collector_management.modals.html | 2 +- .../fill_form/modals/fill_form.modals.html | 2 +- .../modals/survey_form.modals.html | 4 +- .../src/modules/survey_form/survey_form.html | 2 +- server/models/migrations/next/migrate.sql | 148 ++++++++++++++++++ .../migrations/v1.2.0-v1.3.0/migrate.sql | 4 +- 9 files changed, 160 insertions(+), 11 deletions(-) diff --git a/client/src/i18n/en/tree.json b/client/src/i18n/en/tree.json index 1118ecbb81..f9d205771b 100644 --- a/client/src/i18n/en/tree.json +++ b/client/src/i18n/en/tree.json @@ -30,7 +30,7 @@ "CREDITOR_GROUP" : "Creditor Group Management", "CURRENCY" : "Currency", "DATA_COLLECTION": "Data Collection", - "DATA_COLLECTOR_MANAGEMENT": "Data Collector Management", + "FORMS_MANAGEMENT": "Forms Management", "DATA_KIT": ".Data collection kit", "DATA_KIT_REPORT": "Data Collection Kit Report", "DEPARTMENT_MANAGEMENT" : "Department Management", @@ -134,6 +134,7 @@ "SUBSIDY" : "Subsidy Management", "STAFFING_INDICES_MANAGEMENT" : "Staffing indices management", "SURVEY_FORM": "Survey Form", + "FORMS_CONFIGURATION": "Forms configuration", "TRANSACTION_TYPE" : "Transaction Type Management", "TAGS" : "Tags Management", "USERS" : "User Management", diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json index 409bee97d9..b4c0d9bede 100644 --- a/client/src/i18n/fr/tree.json +++ b/client/src/i18n/fr/tree.json @@ -30,7 +30,7 @@ "CREDITOR_GROUP":"Gestion des Groupes Créditeurs", "CURRENCY":"Monnaie", "DATA_COLLECTION": "Collecte de données", - "DATA_COLLECTOR_MANAGEMENT": "Gestion des collecteurs de données", + "FORMS_MANAGEMENT": "Gestion des formulaires", "DATA_KIT": ".Kit de collecte de données", "DATA_KIT_REPORT": "Rapport des collectes des données", "DEPARTMENT_MANAGEMENT" : "Gestion des Departements", @@ -131,7 +131,7 @@ "STOCK_LOTS":"Lots en stock", "STOCK_VALUE" : "[Stock] Valeur de stock", "STOCK_MOVEMENTS":"Movements de stock", - "SURVEY_FORM": "Formulaires d'enquêtes", + "FORMS_CONFIGURATION": "Configuration des formulaires", "TRANSACTION_TYPE":"Types de Transaction", "TAGS" : "Gestion des étiquettes", "SUBSIDY":"Gestion des subventions", diff --git a/client/src/modules/data_collector_management/data_collector_management.html b/client/src/modules/data_collector_management/data_collector_management.html index 6808ce570a..3795d3d5e1 100644 --- a/client/src/modules/data_collector_management/data_collector_management.html +++ b/client/src/modules/data_collector_management/data_collector_management.html @@ -2,7 +2,7 @@
          1. TREE.ADMIN
            2. -
          2. TREE.DATA_COLLECTOR_MANAGEMENT
            3. +
          3. TREE.FORMS_MANAGEMENT
          diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html index de22e6125b..6f248b0f88 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -4,7 +4,7 @@
        • TREE.ADMIN
        • - TREE.DATA_COLLECTOR_MANAGEMENT + TREE.FORMS_MANAGEMENT
          • diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index f81ea4b9a8..334d1f2194 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -4,7 +4,7 @@
        • TREE.DATA_COLLECTION
        • - TREE.SURVEY_FORM + TREE.FORMS_CONFIGURATION
          • diff --git a/client/src/modules/survey_form/modals/survey_form.modals.html b/client/src/modules/survey_form/modals/survey_form.modals.html index 6301a0284a..94bbcbbede 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.html +++ b/client/src/modules/survey_form/modals/survey_form.modals.html @@ -4,11 +4,11 @@
        • TREE.ADMIN
        • - TREE.SURVEY_FORM + TREE.FORMS_CONFIGURATION
        • - TREE.SURVEY_FORM + TREE.FORMS_CONFIGURATION
          • diff --git a/client/src/modules/survey_form/survey_form.html b/client/src/modules/survey_form/survey_form.html index f1030946ca..d263a50ce0 100644 --- a/client/src/modules/survey_form/survey_form.html +++ b/client/src/modules/survey_form/survey_form.html @@ -2,7 +2,7 @@
          1. TREE.ADMIN
            2. -
          2. TREE.SURVEY_FORM
            3. +
          3. TREE.FORMS_CONFIGURATION
          diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index 9417a57dae..50da693cd4 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -8,3 +8,151 @@ ALTER TABLE `stock_consumption` ADD CONSTRAINT `fk_period_id_sc` FOREIGN KEY (`p /* * DATABASE CHANGES FOR VERSION 1.6.0 TO 1.7.0 */ +<<<<<<< d148b1e96ac9e25ecbd9ae4ae2eb92d81db9ca9f +======= + +/* + * @author: lomamech + * @date: 2019-08-28 + * @description: bhima_data_collector +*/ + +DROP TABLE IF EXISTS `data_collector_management`; +CREATE TABLE `data_collector_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `description` TEXT, + `version_number` INT(11) UNSIGNED NOT NULL, + `color` VARCHAR(8) NULL, + `is_related_patient` TINYINT(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `choices_list_management`; +CREATE TABLE `choices_list_management` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `fixed` tinyint(1) DEFAULT 0, + `parent` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `group_label` MEDIUMINT(8) UNSIGNED DEFAULT 0, + `is_group` tinyint(1) NOT NULL DEFAULT 0, + `is_title` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + UNIQUE KEY `choices_list_management_1` (`label`, `name`, `parent`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_form`; +CREATE TABLE `survey_form` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `type` VARCHAR(100) NOT NULL, + `choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `filter_choice_list_id` MEDIUMINT(8) UNSIGNED NULL, + `other_choice` tinyint(1) DEFAULT 0, + `name` VARCHAR(100) NOT NULL, + `label` VARCHAR(100) NOT NULL, + `hint` TEXT, + `required` tinyint(1) DEFAULT 0, + `constraint` VARCHAR(100) NULL, + `default` VARCHAR(100) NULL, + `calculation` VARCHAR(100) NULL, + `rank` SMALLINT(5) UNSIGNED NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `survey_form_1` (`data_collector_management_id`, `name`, `label`), + KEY `data_collector_management_id` (`data_collector_management_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_form_type`; +CREATE TABLE `survey_form_type` ( + `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, + `label` VARCHAR(100) NOT NULL, + `type` VARCHAR(100) NOT NULL, + `is_list` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data`; +CREATE TABLE `survey_data` ( + `uuid` BINARY(16), + `data_collector_management_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `is_deleted` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`uuid`), + KEY `data_collector_management_id` (`data_collector_management_id`), + KEY `user_id` (`user_id`), + FOREIGN KEY (`data_collector_management_id`) REFERENCES `data_collector_management` (`id`), + FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_item`; +CREATE TABLE `survey_data_item` ( + `uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `survey_data_log`; +CREATE TABLE `survey_data_log` ( + `uuid` BINARY(16), + `log_uuid` BINARY(16), + `survey_form_id` MEDIUMINT(8) UNSIGNED NOT NULL, + `survey_form_label` VARCHAR(100), + `survey_data_uuid` BINARY(16) NOT NULL, + `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `user_id` SMALLINT(5) UNSIGNED NOT NULL, + `status` VARCHAR(20), + `value` text, + PRIMARY KEY (`uuid`), + KEY `survey_form_id` (`survey_form_id`), + KEY `survey_data_uuid` (`survey_data_uuid`), + FOREIGN KEY (`survey_form_id`) REFERENCES `survey_form` (`id`), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `medical_sheet`; +CREATE TABLE `medical_sheet` ( + `survey_data_uuid` BINARY(16), + `patient_uuid` BINARY(16), + FOREIGN KEY (`survey_data_uuid`) REFERENCES `survey_data` (`uuid`), + FOREIGN KEY (`patient_uuid`) REFERENCES `patient` (`uuid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + +INSERT INTO `unit` VALUES + (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'), + (252, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 249, '/modules/data_kit', '/data_kit'), + (253, 'Data Collector Management', 'TREE.FORMS_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.FORMS_CONFIGURATION', '', 252, '/modules/survey_form', '/survey_form'), + (256, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); + +INSERT INTO `report` (`id`, `report_key`, `title_key`) VALUES + (39, 'dataKit', 'TREE.DATA_KIT_REPORT'); + +-- Survey Form Type +INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES + ('FORM.LABELS.NUMBER', 'number', 0), + ('FORM.LABELS.TEXT', 'text', 0), + ('FORM.LABELS.SELECT_ONE', 'select_one', 1), + ('FORM.LABELS.SELECT_MULTIPLE', 'select_multiple', 1), + ('FORM.LABELS.NOTE', 'note', 0), + ('FORM.LABELS.DATE', 'date', 0), + ('FORM.LABELS.TIME', 'time', 0), + ('FORM.LABELS.IMAGE', 'image', 0), + ('FORM.LABELS.CALCULATION', 'calculation', 0), + ('FORM.LABELS.TEXT_AREA', 'text_area', 0); + +-- BHIMA DATA COLLECTOR +>>>>>>> improvement(Bhima Data Collector) diff --git a/server/models/migrations/v1.2.0-v1.3.0/migrate.sql b/server/models/migrations/v1.2.0-v1.3.0/migrate.sql index 6e5b327ebe..f257a8300d 100644 --- a/server/models/migrations/v1.2.0-v1.3.0/migrate.sql +++ b/server/models/migrations/v1.2.0-v1.3.0/migrate.sql @@ -185,9 +185,9 @@ CREATE TABLE `medical_sheet` ( INSERT INTO `unit` VALUES (246, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 0, '/modules/data_kit', '/data_kit'), - (247, 'Data Collector Management', 'TREE.DATA_COLLECTOR_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), + (247, 'Data Collector Management', 'TREE.FORMS_MANAGEMENT', '', 246, '/modules/data_collector_management', '/data_collector_management'), (248, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 246, '/modules/choices_list_management', '/choices_list_management'), - (249, 'Survey Form', 'TREE.SURVEY_FORM', '', 246, '/modules/survey_form', '/survey_form'), + (249, 'Survey Form', 'TREE.FORMS_CONFIGURATION', '', 246, '/modules/survey_form', '/survey_form'), (250, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), (251, 'Fill Form', 'TREE.FILL_FORM', '', 250, '/modules/fill_form', '/fill_form'), (252, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 250, '/modules/display_metadata', '/display_metadata'), From d316f8b27085bfc0842a3bfddbafec02b99b51ef Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Wed, 16 Oct 2019 09:36:35 +0100 Subject: [PATCH 24/30] improvement(Data Collector) - Add new service Format Tree Data Service This service order element from list Get children from root node Flattens a tree data structure - Remove function order, flatten, getChildren in accountService - Remove function order, flatten, getChildren in FormatTreeDataService --- client/src/js/components/bhAccountSelect.js | 6 +- .../js/components/bhAccountSelectMultiple.js | 6 +- .../js/components/bhAccountTypeaheadInline.js | 6 +- .../src/js/services/FormatTreeDataService.js | 100 ++++++++++++++++++ .../account_reference.modal.js | 6 +- .../modules/account_reference/search.modal.js | 6 +- client/src/modules/accounts/AccountGrid.js | 9 +- .../src/modules/accounts/accounts.service.js | 79 -------------- .../choices_list_management.js | 8 +- .../choices_list_management.service.js | 83 --------------- .../general-ledger/general-ledger.ctrl.js | 6 +- .../analysisAuxiliaryCash.config.js | 5 +- .../monthlyBalance/monthlyBalance.config.js | 5 +- .../modules/vouchers/voucher-form.service.js | 6 +- server/models/migrations/next/migrate.sql | 26 ++--- server/models/schema.sql | 2 + 16 files changed, 152 insertions(+), 207 deletions(-) create mode 100644 client/src/js/services/FormatTreeDataService.js diff --git a/client/src/js/components/bhAccountSelect.js b/client/src/js/components/bhAccountSelect.js index 38bbfc2b7e..e442dbf660 100644 --- a/client/src/js/components/bhAccountSelect.js +++ b/client/src/js/components/bhAccountSelect.js @@ -15,13 +15,13 @@ angular.module('bhima.components') }); AccountSelectController.$inject = [ - 'AccountService', 'bhConstants', '$scope', + 'AccountService', 'FormatTreeDataService', 'bhConstants', '$scope', ]; /** * Account selection component */ -function AccountSelectController(Accounts, bhConstants, $scope) { +function AccountSelectController(Accounts, FormatTreeData, bhConstants, $scope) { const $ctrl = this; // fired at the beginning of the account select @@ -67,7 +67,7 @@ function AccountSelectController(Accounts, bhConstants, $scope) { Accounts.read(null, params) .then(elements => { // bind the accounts to the controller - let accounts = Accounts.order(elements); + let accounts = FormatTreeData.order(elements); if ($ctrl.excludeTitleAccounts) { accounts = Accounts.filterTitleAccounts(accounts); diff --git a/client/src/js/components/bhAccountSelectMultiple.js b/client/src/js/components/bhAccountSelectMultiple.js index 7d01bfd94f..7d40a19378 100644 --- a/client/src/js/components/bhAccountSelectMultiple.js +++ b/client/src/js/components/bhAccountSelectMultiple.js @@ -15,13 +15,13 @@ angular.module('bhima.components') }); AccountSelectController.$inject = [ - 'AccountService', 'bhConstants', + 'AccountService', 'FormatTreeDataService', 'bhConstants', ]; /** * Account selection component */ -function AccountSelectController(Accounts, bhConstants) { +function AccountSelectController(Accounts, FormatTreeData, bhConstants) { const $ctrl = this; // fired at the beginning of the account select @@ -67,7 +67,7 @@ function AccountSelectController(Accounts, bhConstants) { Accounts.read(null, params) .then(elements => { // bind the accounts to the controller - let accounts = Accounts.order(elements); + let accounts = FormatTreeData.order(elements); if ($ctrl.excludeTitleAccounts) { accounts = Accounts.filterTitleAccounts(accounts); diff --git a/client/src/js/components/bhAccountTypeaheadInline.js b/client/src/js/components/bhAccountTypeaheadInline.js index 5fbd05baf5..bd2bf74205 100644 --- a/client/src/js/components/bhAccountTypeaheadInline.js +++ b/client/src/js/components/bhAccountTypeaheadInline.js @@ -10,7 +10,7 @@ angular.module('bhima.components') }); AccountTypeaheadInlineController.$inject = [ - 'AccountService', '$timeout', '$scope', 'Store', + 'AccountService', '$timeout', '$scope', 'Store', 'FormatTreeDataService', ]; /** @@ -20,7 +20,7 @@ AccountTypeaheadInlineController.$inject = [ * It is intended to be used in ui-grids to facilitate entering accounts easily * without having a heavy uiSelect component. */ -function AccountTypeaheadInlineController(Accounts, $timeout, $scope, Store) { +function AccountTypeaheadInlineController(Accounts, $timeout, $scope, Store, FormatTreeData) { const $ctrl = this; const store = new Store(); @@ -49,7 +49,7 @@ function AccountTypeaheadInlineController(Accounts, $timeout, $scope, Store) { Accounts.read(null, params) .then(elements => { // bind the accounts to the controller - const accounts = Accounts.order(elements); + const accounts = FormatTreeData.order(elements); $ctrl.accounts = Accounts.filterTitleAccounts(accounts); store.setData($ctrl.accounts); diff --git a/client/src/js/services/FormatTreeDataService.js b/client/src/js/services/FormatTreeDataService.js new file mode 100644 index 0000000000..5729a4b61d --- /dev/null +++ b/client/src/js/services/FormatTreeDataService.js @@ -0,0 +1,100 @@ +angular.module('bhima.services') + .service('FormatTreeDataService', FormatTreeDataService); + +FormatTreeDataService.$inject = []; + +/** + * @class FormatTreeDataService + * + */ +function FormatTreeDataService(Api) { + const service = this; + + service.formatStore = formatStore; + service.getChildren = getChildren; + service.flatten = flatten; + service.order = order; + + function formatStore(data) { + const storeData = order(data); + return storeData; + } + + /** + * @method order + * + * @description + * Creates a proper Data list ordering by first creating a Data tree and + * then flattening in place. + * + * @param {Array} lists - a list of Data objects + * @returns {Array} - the properly ordered list of Data objects + */ + + function order(data) { + // NOTE: we assume the root node is 0 + const ROOT_NODE = 0; + + // build the Data list tree + const tree = getChildren(data, ROOT_NODE); + + // return a flattened tree (in order) + return flatten(tree); + } + + /** + * @method getChildren + * + * @description + * This method builds a tree data structure of Data and children of a + * specified parentId. + * + * @returns {Array} - an array of children + */ + function getChildren(data, parentId) { + // base case: There are no child element + if (data.length === 0) { return null; } + + // returns all List where the parent is the + // parentId + const children = data.filter(handleParent); + + // recursively call getChildren on all child Data + // and attach them as childen of their parent element + children.forEach(handleChildren); + + function handleParent(element) { + return element.parent === parentId; + } + + function handleChildren(element) { + element.children = getChildren(data, element.id); + } + + return children; + } + + /** + * @method flatten + * + * @description + * Flattens a tree data structure (must have `children` property) in place. + * + * @returns {Array} - the flattened array + */ + function flatten(_tree, _depth) { + const tree = _tree || []; + let depth = (!angular.isDefined(_depth) || Number.isNaN(_depth)) ? -1 : _depth; + depth += 1; + + function handleTreeLevel(array, node) { + const items = [node].concat(node.children ? flatten(node.children, depth) : []); + node.$$treeLevel = depth; + return array.concat(items); + } + + return tree.reduce(handleTreeLevel, []); + } + + return service; +} diff --git a/client/src/modules/account_reference/account_reference.modal.js b/client/src/modules/account_reference/account_reference.modal.js index c78d162a49..8ab1692f92 100644 --- a/client/src/modules/account_reference/account_reference.modal.js +++ b/client/src/modules/account_reference/account_reference.modal.js @@ -3,10 +3,10 @@ angular.module('bhima.controllers') AccountReferenceModalController.$inject = [ '$state', 'AccountService', 'AccountReferenceService', - 'NotifyService', 'appcache', + 'NotifyService', 'appcache', 'FormatTreeDataService', ]; -function AccountReferenceModalController($state, Accounts, AccountReferences, Notify, AppCache) { +function AccountReferenceModalController($state, Accounts, AccountReferences, Notify, AppCache, FormatTreeData) { const vm = this; const cache = AppCache('AccountReferenceModal'); @@ -41,7 +41,7 @@ function AccountReferenceModalController($state, Accounts, AccountReferences, No // load accounts Accounts.read(null, { locked : 0, hidden : 0 }) .then(elements => { - vm.accounts = Accounts.order(elements); + vm.accounts = FormatTreeData.order(elements); }) .catch(Notify.handleError); diff --git a/client/src/modules/account_reference/search.modal.js b/client/src/modules/account_reference/search.modal.js index 2865058b23..f2795060e3 100644 --- a/client/src/modules/account_reference/search.modal.js +++ b/client/src/modules/account_reference/search.modal.js @@ -2,7 +2,7 @@ angular.module('bhima.controllers') .controller('ReferenceSearchModalController', ReferenceSearchModalController); ReferenceSearchModalController.$inject = [ - '$uibModalInstance', 'filters', 'Store', 'util', 'PatientService', 'AccountService', + '$uibModalInstance', 'filters', 'Store', 'util', 'PatientService', 'AccountService', 'FormatTreeDataService', ]; /** @@ -13,7 +13,7 @@ ReferenceSearchModalController.$inject = [ * search functionality on the Account Reference registry page. Filters that are already * applied to the grid can be passed in via the filters inject. */ -function ReferenceSearchModalController(ModalInstance, filters, Store, util, Patients, Accounts) { +function ReferenceSearchModalController(ModalInstance, filters, Store, util, Patients, Accounts, FormatTreeData) { const vm = this; const changes = new Store({ identifier : 'key' }); @@ -37,7 +37,7 @@ function ReferenceSearchModalController(ModalInstance, filters, Store, util, Pat Accounts.read() .then(elements => { // bind the accounts to the controller - const accounts = Accounts.order(elements); + const accounts = FormatTreeData.order(elements); vm.accounts = accounts; }); diff --git a/client/src/modules/accounts/AccountGrid.js b/client/src/modules/accounts/AccountGrid.js index 88f2796709..6f655eb690 100644 --- a/client/src/modules/accounts/AccountGrid.js +++ b/client/src/modules/accounts/AccountGrid.js @@ -2,8 +2,8 @@ angular.module('bhima.services') .service('AccountGridService', AccountGridService); AccountGridService.$inject = [ - 'AccountStoreService', 'AccountService', 'Store', 'LanguageService', - '$httpParamSerializer', + 'AccountStoreService', 'AccountService', 'LanguageService', + '$httpParamSerializer', 'FormatTreeDataService', ]; /** @@ -14,7 +14,8 @@ AccountGridService.$inject = [ * Account Management module, it also provides helper methods for dynamically * adding and removing data. */ -function AccountGridService(AccountStore, Accounts, Store, Languages, $httpParamSerializer) { +function AccountGridService(AccountStore, Accounts, Languages, $httpParamSerializer, + FormatTreeData) { /** * @constructor * @@ -65,7 +66,7 @@ function AccountGridService(AccountStore, Accounts, Store, Languages, $httpParam this._store.data.sort(orderByNumber); // ensure data respects groups - this._store.data = Accounts.order(this._store.data); + this._store.data = FormatTreeData.order(this._store.data); this._store.recalculateIndex(); }; diff --git a/client/src/modules/accounts/accounts.service.js b/client/src/modules/accounts/accounts.service.js index 9a13ab9ea0..e5c87d55e3 100644 --- a/client/src/modules/accounts/accounts.service.js +++ b/client/src/modules/accounts/accounts.service.js @@ -21,14 +21,10 @@ function AccountService(Api, bhConstants, HttpCache) { service.getBalance = getBalance; service.getAnnualBalance = getAnnualBalance; service.getOpeningBalanceForPeriod = getOpeningBalanceForPeriod; - service.getChildren = getChildren; service.filterTitleAccounts = filterTitleAccounts; service.filterAccountByType = filterAccountsByType; service.downloadAccountsTemplate = downloadAccountsTemplate; - service.flatten = flatten; - service.order = order; - /** * @method getOpeningBalance * @@ -103,81 +99,6 @@ function AccountService(Api, bhConstants, HttpCache) { }); } - /** - * @method getChildren - * - * @description - * This method builds a tree data structure of accounts and children of a - * specified parentId. - * - * @returns {Array} - an array of children - */ - function getChildren(accounts, parentId) { - // base case: There are no child accounts - if (accounts.length === 0) { return null; } - - // returns all accounts where the parent is the - // parentId - const children = accounts.filter(handleParent); - - // recursively call getChildren on all child accounts - // and attach them as childen of their parent account - children.forEach(handleChildren); - - function handleParent(account) { - return account.parent === parentId; - } - - function handleChildren(account) { - account.children = getChildren(accounts, account.id); - } - - return children; - } - - /** - * @method flatten - * - * @description - * Flattens a tree data structure (must have `children` property) in place. - * - * @returns {Array} - the flattened array - */ - function flatten(_tree, _depth) { - const tree = _tree || []; - let depth = (!angular.isDefined(_depth) || Number.isNaN(_depth)) ? -1 : _depth; - depth += 1; - - function handleTreeLevel(array, node) { - const items = [node].concat(node.children ? flatten(node.children, depth) : []); - node.$$treeLevel = depth; - return array.concat(items); - } - - return tree.reduce(handleTreeLevel, []); - } - - /** - * @method order - * - * @description - * Creates a proper account ordering by first creating an account tree and - * then flattening in place. - * - * @param {Array} accounts - a list of account objects - * @returns {Array} - the properly ordered list of account objects - */ - function order(accounts) { - // NOTE: we assume the root node is 0 - const ROOT_NODE = 0; - - // build the account tree - const tree = getChildren(accounts, ROOT_NODE); - - // return a flattened tree (in order) - return flatten(tree); - } - /** * @method downloadAccountsTemplate * diff --git a/client/src/modules/choices_list_management/choices_list_management.js b/client/src/modules/choices_list_management/choices_list_management.js index b6739155e6..3c73bfff76 100644 --- a/client/src/modules/choices_list_management/choices_list_management.js +++ b/client/src/modules/choices_list_management/choices_list_management.js @@ -3,6 +3,7 @@ angular.module('bhima.controllers') ChoicesListManagementController.$inject = [ '$state', 'ChoicesListManagementService', 'NotifyService', 'uiGridConstants', 'ModalService', + 'FormatTreeDataService', ]; /** @@ -10,7 +11,8 @@ ChoicesListManagementController.$inject = [ * This module is responsible for handling the CRUD operation on CHOICES LIST MANAGEMENT */ -function ChoicesListManagementController($state, ChoicesListManagement, Notify, uiGridConstants, ModalService) { +function ChoicesListManagementController($state, ChoicesListManagement, Notify, uiGridConstants, ModalService, + FormatTreeData) { const vm = this; vm.gridApi = {}; vm.filterEnabled = false; @@ -98,8 +100,8 @@ function ChoicesListManagementController($state, ChoicesListManagement, Notify, ChoicesListManagement.read() .then((data) => { - const dataTree = ChoicesListManagement.formatStore(data); - vm.gridOptions.data = dataTree; + const treeData = FormatTreeData.formatStore(data); + vm.gridOptions.data = treeData; }) .catch(handleError) .finally(toggleLoadingIndicator); diff --git a/client/src/modules/choices_list_management/choices_list_management.service.js b/client/src/modules/choices_list_management/choices_list_management.service.js index 6077b8dc89..5efee96eaa 100644 --- a/client/src/modules/choices_list_management/choices_list_management.service.js +++ b/client/src/modules/choices_list_management/choices_list_management.service.js @@ -13,88 +13,5 @@ ChoicesListManagementService.$inject = ['PrototypeApiService']; function ChoicesListManagementService(Api) { const service = new Api('/choices_list_management/'); - service.formatStore = formatStore; - - function formatStore(data) { - const storeData = order(data); - return storeData; - } - - /** - * @method order - * - * @description - * Creates a proper choice list ordering by first creating an choice list tree and - * then flattening in place. - * - * @param {Array} lists - a list of choices lists objects - * @returns {Array} - the properly ordered list of choices lists objects - */ - - function order(data) { - // NOTE: we assume the root node is 0 - const ROOT_NODE = 0; - - // build the choices list tree - const tree = getChildren(data, ROOT_NODE); - - // return a flattened tree (in order) - return flatten(tree); - } - - /** - * @method getChildren - * - * @description - * This method builds a tree data structure of Choices lists and children of a - * specified parentId. - * - * @returns {Array} - an array of children - */ - function getChildren(data, parentId) { - // base case: There are no child Choices list - if (data.length === 0) { return null; } - - // returns all List where the parent is the - // parentId - const children = data.filter(handleParent); - - // recursively call getChildren on all child accounts - // and attach them as childen of their parent account - children.forEach(handleChildren); - - function handleParent(choiceList) { - return choiceList.parent === parentId; - } - - function handleChildren(choiceList) { - choiceList.children = getChildren(data, choiceList.id); - } - - return children; - } - - /** - * @method flatten - * - * @description - * Flattens a tree data structure (must have `children` property) in place. - * - * @returns {Array} - the flattened array - */ - function flatten(_tree, _depth) { - const tree = _tree || []; - let depth = (!angular.isDefined(_depth) || Number.isNaN(_depth)) ? -1 : _depth; - depth += 1; - - function handleTreeLevel(array, node) { - const items = [node].concat(node.children ? flatten(node.children, depth) : []); - node.$$treeLevel = depth; - return array.concat(items); - } - - return tree.reduce(handleTreeLevel, []); - } - return service; } diff --git a/client/src/modules/general-ledger/general-ledger.ctrl.js b/client/src/modules/general-ledger/general-ledger.ctrl.js index 4a0d44ab91..cd25a12958 100644 --- a/client/src/modules/general-ledger/general-ledger.ctrl.js +++ b/client/src/modules/general-ledger/general-ledger.ctrl.js @@ -5,7 +5,7 @@ GeneralLedgerController.$inject = [ 'GeneralLedgerService', 'SessionService', 'NotifyService', 'uiGridConstants', 'GridColumnService', 'GridStateService', '$state', 'LanguageService', 'ModalService', 'FiscalService', 'bhConstants', - 'AccountService', + 'AccountService', 'FormatTreeDataService', ]; /** @@ -16,7 +16,7 @@ GeneralLedgerController.$inject = [ */ function GeneralLedgerController( GeneralLedger, Session, Notify, uiGridConstants, Columns, - GridState, $state, Languages, Modal, Fiscal, bhConstants, Accounts + GridState, $state, Languages, Modal, Fiscal, bhConstants, Accounts, FormatTreeData ) { const vm = this; const cacheKey = 'GeneralLedger'; @@ -196,7 +196,7 @@ function GeneralLedgerController( function loadData(accounts = []) { accounts.forEach(preProcessAccounts); - Accounts.order(accounts); + FormatTreeData.order(accounts); // cache each accounts $$treeLevel accounts.forEach(account => { diff --git a/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js b/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js index 4089468f2f..5d6b8755aa 100644 --- a/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js +++ b/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js @@ -3,9 +3,10 @@ angular.module('bhima.controllers') AnalysisAuxiliaryCashController.$inject = [ '$sce', 'NotifyService', 'BaseReportService', 'AppCache', 'reportData', '$state', 'AccountService', + 'FormatTreeDataService', ]; -function AnalysisAuxiliaryCashController($sce, Notify, SavedReports, AppCache, reportData, $state, Accounts) { +function AnalysisAuxiliaryCashController($sce, Notify, SavedReports, AppCache, reportData, $state, Accounts, FormatTreeData) { const vm = this; const cache = new AppCache('analysisAuxiliaryCash'); const reportUrl = 'reports/finance/analysis_auxiliary_cashbox'; @@ -16,7 +17,7 @@ function AnalysisAuxiliaryCashController($sce, Notify, SavedReports, AppCache, r Accounts.read() .then(elements => { // bind the accounts to the controller - const accounts = Accounts.order(elements); + const accounts = FormatTreeData.order(elements); vm.accounts = accounts; }); diff --git a/client/src/modules/reports/generate/monthlyBalance/monthlyBalance.config.js b/client/src/modules/reports/generate/monthlyBalance/monthlyBalance.config.js index fc7098bc73..7e2fdd351f 100644 --- a/client/src/modules/reports/generate/monthlyBalance/monthlyBalance.config.js +++ b/client/src/modules/reports/generate/monthlyBalance/monthlyBalance.config.js @@ -3,9 +3,10 @@ angular.module('bhima.controllers') MonthlyBalanceController.$inject = [ '$sce', 'NotifyService', 'BaseReportService', 'AppCache', 'reportData', '$state', 'AccountService', + 'FormatTreeDataService', ]; -function MonthlyBalanceController($sce, Notify, SavedReports, AppCache, reportData, $state, Accounts) { +function MonthlyBalanceController($sce, Notify, SavedReports, AppCache, reportData, $state, Accounts, FormatTreeData) { const vm = this; const cache = new AppCache('monthlyBalance'); const reportUrl = 'reports/finance/monthly_balance'; @@ -16,7 +17,7 @@ function MonthlyBalanceController($sce, Notify, SavedReports, AppCache, reportDa Accounts.read() .then(elements => { // bind the accounts to the controller - const accounts = Accounts.order(elements); + const accounts = FormatTreeData.order(elements); vm.accounts = accounts; }); diff --git a/client/src/modules/vouchers/voucher-form.service.js b/client/src/modules/vouchers/voucher-form.service.js index 95a262f587..94396b79c3 100644 --- a/client/src/modules/vouchers/voucher-form.service.js +++ b/client/src/modules/vouchers/voucher-form.service.js @@ -4,7 +4,7 @@ angular.module('bhima.services') VoucherFormService.$inject = [ 'VoucherService', 'bhConstants', 'SessionService', 'VoucherItemService', 'AppCache', 'Store', 'AccountService', '$timeout', '$translate', - 'ExchangeRateService', + 'ExchangeRateService', 'FormatTreeDataService', ]; /** @@ -19,7 +19,7 @@ VoucherFormService.$inject = [ */ function VoucherFormService( Vouchers, Constants, Session, VoucherItem, AppCache, Store, Accounts, - $timeout, $translate, Exchange + $timeout, $translate, Exchange, FormatTreeData ) { // Error Flags // must have transaction_type for certain cases @@ -65,7 +65,7 @@ function VoucherFormService( Accounts.read() .then((accounts) => { - this.accounts = Accounts.order(accounts); + this.accounts = FormatTreeData.order(accounts); }); // this will contain the grid rows diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index 50da693cd4..189a60b8d2 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -8,8 +8,9 @@ ALTER TABLE `stock_consumption` ADD CONSTRAINT `fk_period_id_sc` FOREIGN KEY (`p /* * DATABASE CHANGES FOR VERSION 1.6.0 TO 1.7.0 */ -<<<<<<< d148b1e96ac9e25ecbd9ae4ae2eb92d81db9ca9f -======= +/* + * DATABASE CHANGES FOR VERSION 1.4.0 TO 1.5.0 + */ /* * @author: lomamech @@ -129,17 +130,17 @@ CREATE TABLE `medical_sheet` ( ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; INSERT INTO `unit` VALUES - (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'), - (252, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 249, '/modules/data_kit', '/data_kit'), - (253, 'Data Collector Management', 'TREE.FORMS_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.FORMS_CONFIGURATION', '', 252, '/modules/survey_form', '/survey_form'), - (256, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); + (254, 'Data Collection', 'TREE.DATA_COLLECTION', '', 0, '/modules/data_collection', '/data_collection'), + (255, 'Fill Form', 'TREE.FILL_FORM', '', 254, '/modules/fill_form', '/fill_form'), + (256, 'Display Metadata', 'TREE.DISPLAY_METADATA', '', 254, '/modules/display_metadata', '/display_metadata'), + (257, 'Data Kit', 'TREE.DATA_KIT', 'Data Kit', 254, '/modules/data_kit', '/data_kit'), + (258, 'Data Collector Management', 'TREE.FORMS_MANAGEMENT', '', 257, '/modules/data_collector_management', '/data_collector_management'), + (259, 'Choices list management', 'TREE.CHOICES_LIST_MANAGEMENT', '', 257, '/modules/choices_list_management', '/choices_list_management'), + (260, 'Survey Form', 'TREE.FORMS_CONFIGURATION', '', 257, '/modules/survey_form', '/survey_form'), + (261, 'Data Kit Report', 'TREE.DATA_KIT_REPORT', 'Data Kit Report', 144, '/modules/reports/dataKit', '/reports/dataKit'); -INSERT INTO `report` (`id`, `report_key`, `title_key`) VALUES - (39, 'dataKit', 'TREE.DATA_KIT_REPORT'); +INSERT INTO `report` (`report_key`, `title_key`) VALUES + ('dataKit', 'TREE.DATA_KIT_REPORT'); -- Survey Form Type INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES @@ -155,4 +156,3 @@ INSERT INTO `survey_form_type` (`label`, `type`, `is_list`) VALUES ('FORM.LABELS.TEXT_AREA', 'text_area', 0); -- BHIMA DATA COLLECTOR ->>>>>>> improvement(Bhima Data Collector) diff --git a/server/models/schema.sql b/server/models/schema.sql index 3b1ca0f113..0c57d52cdd 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2358,6 +2358,8 @@ CREATE TABLE `staffing_indice_parameters` ( PRIMARY KEY (`uuid`), UNIQUE KEY `payroll_config_id`(`payroll_configuration_id`), FOREIGN KEY (`payroll_configuration_id`) REFERENCES `payroll_configuration` (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; + DROP TABLE IF EXISTS `data_collector_management`; CREATE TABLE `data_collector_management` ( `id` MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, From 6fa43312d3dbc260dff7027db2e972824a2e67e6 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Thu, 17 Oct 2019 11:50:36 +0100 Subject: [PATCH 25/30] improvement(Data Collector) - Update placeHolder message in component bhSurveyTypeSelect - Using function parseDataValue and use structure swith for manage type of data - Using ng-required instead to duplicate block of code - Update survey form modals, hide the selection filter for Select Multiple - Use the basic structure for manage vm.reportDetails.multipleChoice value in form of search in Report Data kit --- client/src/i18n/en/form.json | 1 + client/src/i18n/fr/form.json | 1 + .../js/components/bhPatientMedicalSheet.js | 3 +- client/src/modules/accounts/accounts.js | 3 +- .../data_collector_management.modals.html | 4 +- .../modules/fill_form/fill_form.service.js | 29 +- .../fill_form/modals/fill_form.modals.html | 318 ++++++++---------- .../generate/dataKit/dataKit.config.js | 36 +- .../modals/survey_form.modals.html | 34 +- .../survey_form/modals/survey_form.modals.js | 10 +- .../bhSurveyFormTypeSelect.tmpl.html | 2 +- server/models/bhima.sql | 22 +- server/models/migrations/next/migrate.sql | 22 +- 13 files changed, 223 insertions(+), 262 deletions(-) diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index bbcfaacdab..a87d3df0fc 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -901,6 +901,7 @@ "SUPPLIER": "Supplier", "TRANSACTION_TYPE": "Select a Transaction Type", "TYPE": "Select a Type", + "SELECT_TYPE_DATA": "Select the type of data", "USER": "Select User", "VILLAGE": "Select a Village/Township", "WARD":"Select a Ward", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index 076c1a96b4..ac52ba03bc 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -902,6 +902,7 @@ "SUPPLIER": "Selectionner Fournisseur", "TRANSACTION_TYPE": "Sélectionner le Type de la Transaction", "TYPE": "Sélectionner un Type", + "SELECT_TYPE_DATA": "Sélectionner le type de données", "USER": "Selectionner Utilisateur", "VILLAGE": "Sélectionner Village/Commune", "WARD":"Sélectionner un pavillon", diff --git a/client/src/js/components/bhPatientMedicalSheet.js b/client/src/js/components/bhPatientMedicalSheet.js index 2d4b5aaa45..fe0ff63400 100644 --- a/client/src/js/components/bhPatientMedicalSheet.js +++ b/client/src/js/components/bhPatientMedicalSheet.js @@ -21,7 +21,7 @@ PatientMedicalSheetCtrl.$inject = [ function PatientMedicalSheetCtrl(DataCollectorManagement, Notify, uiGridConstants, $state) { const $ctrl = this; - this.$onInit = () => { + $ctrl.$onInit = function $onInit() { $ctrl.gridApi = {}; $ctrl.filterEnabled = false; $ctrl.toggleFilter = toggleFilter; @@ -83,7 +83,6 @@ function PatientMedicalSheetCtrl(DataCollectorManagement, Notify, uiGridConstant // load user grid function loadGrid() { - toggleLoadingIndicator(); $ctrl.hasError = false; $ctrl.loading = true; diff --git a/client/src/modules/accounts/accounts.js b/client/src/modules/accounts/accounts.js index 0b2089bdf8..ac99228aeb 100644 --- a/client/src/modules/accounts/accounts.js +++ b/client/src/modules/accounts/accounts.js @@ -4,6 +4,7 @@ angular.module('bhima.controllers') AccountsController.$inject = [ '$rootScope', '$timeout', 'AccountGridService', 'NotifyService', 'bhConstants', 'LanguageService', 'uiGridConstants', 'ModalService', 'AccountService', '$state', + 'FormatTreeDataService', ]; /** @@ -18,7 +19,7 @@ AccountsController.$inject = [ */ function AccountsController( $rootScope, $timeout, AccountGrid, Notify, Constants, Language, - uiGridConstants, Modal, Accounts + uiGridConstants, Modal, Accounts, FormatTreeData ) { const vm = this; const columns = gridColumns(); diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html index 6f248b0f88..06baddcd51 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -65,8 +65,8 @@ ng-true-value="1" ng-false-value="0" ng-model="DataCollectorManagementModalCtrl.dataCollector.is_related_patient"> - - + + FORM.INFO.IS_RELATED_PATIENT diff --git a/client/src/modules/fill_form/fill_form.service.js b/client/src/modules/fill_form/fill_form.service.js index 5cd2424242..dc7ca2d63d 100644 --- a/client/src/modules/fill_form/fill_form.service.js +++ b/client/src/modules/fill_form/fill_form.service.js @@ -19,8 +19,8 @@ function FillFormService(Api) { function formatData(form, data) { const dataSurveyForm = {}; - // Ici l'on verifie les occurences des donnees existantes - // S'il sont multiples afin de les affecter dans des tableaux + // Here we check the occurrence of existing data + // If they are multiple in order to assign them in tables form.forEach(f => { data.forEach(d => { if ((f.id === d.survey_form_id) && (f.type === '4')) { @@ -31,21 +31,13 @@ function FillFormService(Api) { form.forEach(f => { data.forEach(d => { - // Pour les identifiants des listes des choix, - // il est primordiale de le transormer en Integer + // For the identifiers of the lists of choices, it is essential to transform it into Integer if ((f.id === d.survey_form_id) && (f.type === '4')) { // Multiple choice list management dataSurveyForm[f.name].push(parseInt(d.value, 10)); } else if ((f.id === d.survey_form_id) && (f.type !== '4') && (f.type !== '7')) { - // Single choice list management - d.value = (f.type === '1') ? parseFloat(d.value) : d.value; - d.value = (f.type === '3') ? parseInt(d.value, 10) : d.value; - - // format date - d.value = (f.type === '6') ? new Date(d.value) : d.value; - dataSurveyForm[f.name] = d.value; + dataSurveyForm[f.name] = parseDataValue(d.value, f.type); } else if ((f.id === d.survey_form_id) && (f.type === '7')) { - // format time const newDate = new Date(); const timeSplit = d.value.split(':'); @@ -62,6 +54,19 @@ function FillFormService(Api) { .then(service.util.unwrapHttpResponse); } + function parseDataValue(value, type) { + switch (type) { + case '1': + return parseFloat(value); + case '3': + return parseInt(value, 10); + case '6': + return new Date(value); + default: + return value; + } + } + /* * This function is used to format the value of the constraint * to a valid angular expression, the value encapsulate in. {} Must be transformed into diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index 334d1f2194..3bac5326e7 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -18,213 +18,175 @@

          {{ FillFormModalCtrl.patient.display_name }} / {{ FillFormModalCtrl.patient.reference}} ({{ FillFormModalCtrl.patient.sex }})

          -
          +
          - -
          - - {{ formItem.hint }} -
          - - - - - - - -
          -
          -
          +
          + +
          + + {{ formItem.hint }} + +
          +
          +
          -
          - -
          - - {{ formItem.hint }} -
          - - - - - - -
          + +
          + + {{ formItem.hint }} + +
          -
          - -
          - {{ formItem.hint }} - - -
          - - -
          - {{ formItem.label }} : {{ formItem.calculation }} -
          :{{ FillFormModalCtrl.form[formItem.name] }}
          -
          + +
          + {{ formItem.hint }} + + +
          + + +
          + {{ formItem.label }} : {{ formItem.calculation }} +
          :{{ FillFormModalCtrl.form[formItem.name] }}
          +
          - -
          - - {{ formItem.hint }} -
          + +
          + + {{ formItem.hint }} +
          +
          +
          -
          - + +
          +
          +
          + + {{ formItem.label }} + +
          +
          -
          -
          + +
          +
          + + {{ formItem.hint }} +
          +
          +
          - -
          - -
          -
          -
          - - {{ formItem.label }} + +
          + + + + + + + + -
          -
          - - -
          -
          - - {{ formItem.hint }} - -
          -           - -
          -           + +
          + +
          -
          - -
          - - - - - - - - - -
          - - -
          - - -
          - - -
          - {{ formItem.hint }} -
          -
          diff --git a/client/src/modules/reports/generate/dataKit/dataKit.config.js b/client/src/modules/reports/generate/dataKit/dataKit.config.js index 79115eefd9..0338015719 100644 --- a/client/src/modules/reports/generate/dataKit/dataKit.config.js +++ b/client/src/modules/reports/generate/dataKit/dataKit.config.js @@ -64,25 +64,16 @@ function DataKitConfigController($sce, Notify, SavedReports, AppCache, reportDat if (form.$invalid) { return; } cache.reportDetails = angular.copy(vm.reportDetails); - if (vm.reportDetails.multipleChoice) { - const multipleChoiceLength = Object.keys(vm.reportDetails.multipleChoice).length; - - if (multipleChoiceLength) { - Object.keys(vm.reportDetails.multipleChoice).forEach((key) => { - if (vm.reportDetails.multipleChoice[key].length) { - for (let i = 0; i < vm.reportDetails.multipleChoice[key].length; i++) { - vm.choicesLists.forEach(list => { - if (list.id === vm.reportDetails.multipleChoice[key][i]) { - vm.reportDetails.multipleChoice[key][i] = list.label; - } - }); - } - } else { - delete vm.reportDetails.multipleChoice[key]; + angular.forEach(vm.reportDetails.multipleChoice, (values, key) => { + // values is an array. + values.forEach((value, index) => { + vm.choicesLists.forEach(list => { + if (list.id === value) { + vm.reportDetails.multipleChoice[key][index] = list.label; } }); - } - } + }); + }); SavedReports.requestPreview(reportUrl, reportData.id, angular.copy(vm.reportDetails)) .then((result) => { @@ -95,6 +86,17 @@ function DataKitConfigController($sce, Notify, SavedReports, AppCache, reportDat vm.clearPreview = function clearPreview() { vm.previewGenerated = false; vm.previewResult = null; + + angular.forEach(vm.reportDetails.multipleChoice, (values, key) => { + // values is an array. + values.forEach((value, index) => { + vm.choicesLists.forEach(list => { + if (list.label === value) { + vm.reportDetails.multipleChoice[key][index] = list.id; + } + }); + }); + }); }; vm.requestSaveAs = function requestSaveAs() { diff --git a/client/src/modules/survey_form/modals/survey_form.modals.html b/client/src/modules/survey_form/modals/survey_form.modals.html index 94bbcbbede..869ba4d94a 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.html +++ b/client/src/modules/survey_form/modals/survey_form.modals.html @@ -60,15 +60,18 @@

          on-select-callback="SurveyFormModalCtrl.onSelectList(list)"> - - +
          + + + +

          diff --git a/client/src/modules/survey_form/modals/survey_form.modals.js b/client/src/modules/survey_form/modals/survey_form.modals.js index 0a323de491..92201ef371 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.js +++ b/client/src/modules/survey_form/modals/survey_form.modals.js @@ -25,12 +25,12 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol vm.onSelectSurvey = onSelectSurvey; function selectType(type) { + console.log('PLUSSSSSsssssss'); + console.log(type); + vm.surveyForm.type = type.id; - if (type.is_list) { - vm.selectList = true; - } else { - vm.selectList = false; - } + vm.selectList = (type.is_list) ? 1 : 0; + vm.selectOne = ((type.id === 3) && type.is_list) ? 1 : 0; } function onSelectList(list) { diff --git a/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html b/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html index d3d1005c2a..97a1be97d7 100644 --- a/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html +++ b/client/src/modules/templates/bhSurveyFormTypeSelect.tmpl.html @@ -13,7 +13,7 @@ ng-model= "$ctrl.typeElement" on-select="$ctrl.onSelect($item, $model)" ng-required="$ctrl.required"> - + {{ $select.selected.plainText }} Date: Thu, 17 Oct 2019 12:06:43 +0100 Subject: [PATCH 26/30] Sanitaze Code --- .../src/modules/display_metadata/modals/search.modal.html | 2 +- client/src/modules/fill_form/modals/fill_form.modals.html | 8 ++++---- client/src/modules/reports/generate/dataKit/dataKit.html | 2 +- .../src/modules/survey_form/modals/survey_form.modals.js | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/client/src/modules/display_metadata/modals/search.modal.html b/client/src/modules/display_metadata/modals/search.modal.html index 8b0b343d0c..9d9c0faa5c 100644 --- a/client/src/modules/display_metadata/modals/search.modal.html +++ b/client/src/modules/display_metadata/modals/search.modal.html @@ -91,7 +91,7 @@ required="formItem.valueRequired" list-label="{{ formItem.label }}" list-hint="{{ formItem.hint }}" - group-label="formItem.choice_list_id" + group-label="formItem.choice_list_id" on-change="$ctrl.onSelectMultiple(lists, formItem.name)">
          diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index 3bac5326e7..b4f8d0c229 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -54,11 +54,11 @@

          {{ FillFormModalCtrl on-change="FillFormModalCtrl.onDateChange(date, formItem.name)">

          - +
          {{ formItem.label }} : {{ formItem.calculation }} -
          :{{ FillFormModalCtrl.form[formItem.name] }}
          +
          :{{ FillFormModalCtrl.form[formItem.name] }}
          @@ -103,7 +103,7 @@
          {{ formItem.hint }} -
          required="formItem.valueRequired" list-label="{{ formItem.label }}" list-hint="{{ formItem.hint }}" - group-label="formItem.choice_list_id" + group-label="formItem.choice_list_id" on-change="FillFormModalCtrl.onSelectMultiple(lists, formItem.name)">
          diff --git a/client/src/modules/reports/generate/dataKit/dataKit.html b/client/src/modules/reports/generate/dataKit/dataKit.html index 3b6efc4f3f..ffa7c5ed44 100644 --- a/client/src/modules/reports/generate/dataKit/dataKit.html +++ b/client/src/modules/reports/generate/dataKit/dataKit.html @@ -97,7 +97,7 @@

          TREE.DATA_KIT_REPORT

          name="{{ formItem.name }}" required="formItem.valueRequired" list-label="{{ formItem.label }}" - group-label="formItem.choice_list_id" + group-label="formItem.choice_list_id" on-change="ReportConfigCtrl.onSelectMultiple(lists, formItem.name)">
          diff --git a/client/src/modules/survey_form/modals/survey_form.modals.js b/client/src/modules/survey_form/modals/survey_form.modals.js index 92201ef371..08d4ec9859 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.js +++ b/client/src/modules/survey_form/modals/survey_form.modals.js @@ -25,9 +25,6 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol vm.onSelectSurvey = onSelectSurvey; function selectType(type) { - console.log('PLUSSSSSsssssss'); - console.log(type); - vm.surveyForm.type = type.id; vm.selectList = (type.is_list) ? 1 : 0; vm.selectOne = ((type.id === 3) && type.is_list) ? 1 : 0; From 0d58503ced33f52f7e463cdb3366478bf21a740e Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Tue, 22 Oct 2019 15:35:57 +0100 Subject: [PATCH 27/30] improvement(Data Collector) - Added the option to include the patient selection component in the data collection form - Display of the name of the user as well as that of the patient if the form is associated with the patient --- client/src/i18n/en/form.json | 1 + client/src/i18n/en/table.json | 2 + client/src/i18n/fr/form.json | 1 + client/src/i18n/fr/table.json | 2 + .../data_collector_management.js | 8 +++ .../data_collector_management.modals.html | 16 ++++++ ...pl.html => include_patient_data.cell.html} | 2 +- .../display_metadata/display_metadata.js | 12 +++-- .../display_metadata.routes.js | 2 +- .../display_metadata/modals/search.modal.js | 2 + .../templates/patient.cell.html | 3 ++ .../display_metadata/templates/user.cell.html | 3 ++ .../fill_form/modals/fill_form.modals.html | 9 ++++ .../fill_form/modals/fill_form.modals.js | 37 ++++++++++++-- .../generate/dataKit/dataKit.config.js | 2 + .../admin/dataCollectorManagement.js | 13 +++-- server/controllers/admin/displayMetadata.js | 50 +++++++++++++++---- server/controllers/admin/fillFormsData.js | 18 +++++++ .../controllers/admin/metadataReport/index.js | 21 +++++--- .../metadataReport/metadatacard.handlebars | 12 +++++ server/models/migrations/next/migrate.sql | 1 + server/models/schema.sql | 1 + test/data.sql | 4 +- test/end-to-end/fillForm/fillForm.page.js | 2 +- test/end-to-end/fillForm/fillForm.spec.js | 1 + test/integration/dataCollectorManagement.js | 6 ++- 26 files changed, 195 insertions(+), 36 deletions(-) rename client/src/modules/data_collector_management/templates/{is_related_patient.tmpl.html => include_patient_data.cell.html} (71%) create mode 100644 client/src/modules/display_metadata/templates/patient.cell.html create mode 100644 client/src/modules/display_metadata/templates/user.cell.html diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index a87d3df0fc..b457b503d1 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -177,6 +177,7 @@ "GROUPS_DEBTOR": "Assign a new debtor group from the options below. Press 'confirm' to permanently update the patient's debtor group", "GROUPS_PATIENT": "Assign the patient to patient groups from the options below. Press 'confirm' to permanently update the patient's subscribed groups.", "IMPORT_SUCCESS": "Successfully Imported", + "INCLUDE_PATIENT_DATA": "include patient data", "INVOICES": "Invoices", "IS_ASSOCIATED_EMPLOYEE" : "will be associated with the employee ID", "IS_DISCOUNT": "Is it a deduction or an addition?", diff --git a/client/src/i18n/en/table.json b/client/src/i18n/en/table.json index faa24f87e7..55432de339 100644 --- a/client/src/i18n/en/table.json +++ b/client/src/i18n/en/table.json @@ -161,6 +161,7 @@ "OF": "of", "PASSIVE": "Passive", "PATIENT": "Patient", + "PATIENT_NAME": "Patient Name", "PATIENT_ID": "ID Patient", "PAYSLIP": "Payslip", "PAYROLL_BULLETINS": "Payroll Bulletins", @@ -199,6 +200,7 @@ "REF_GROUP": "Ref. Group", "REGISTRATION_NUMBER": "Registration number", "REMAINING_BALANCE": "Remaining Balance", + "REGISTERED_BY" : "Registered by", "REGISTERED_ON": "Registered on", "RESPONSIBLE": "Responsible", "RESULT": "Result", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index ac52ba03bc..de183568e7 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -177,6 +177,7 @@ "GROUPS_DEBTOR": "Attribuez un nouveau Groupe Débiteur parmi les options ci-dessous. Appuyez sur 'confirmer' pour une mise à jour permanente du Groupe Débiteur du patient", "GROUPS_PATIENT": "Attribuer le patient à des groupes parmi les options ci-dessous. Appuyez sur 'confirmer' pour une mise à jour permanente des groupes souscrites du patient.", "IMPORT_SUCCESS": "Importation avec succes", + "INCLUDE_PATIENT_DATA": "inclure les données du patient", "INVOICES": "Factures", "ITEMS_FULL": "Il n'y a pas d'articles supplémentaires qui seront affectés à cette facture.", "IS_ASSOCIATED_EMPLOYEE" : "sera associé à l'identifiant de l'employé", diff --git a/client/src/i18n/fr/table.json b/client/src/i18n/fr/table.json index bc18200ffd..d6f3fe3fb2 100644 --- a/client/src/i18n/fr/table.json +++ b/client/src/i18n/fr/table.json @@ -161,6 +161,7 @@ "OF": "sur", "PASSIVE": "Passive", "PATIENT": "Patient", + "PATIENT_NAME": "Nom du Patient", "PATIENT_ID": "Patient Id", "PAYMENT_ID" : "ID Paiement", "PAYMENT_INVOICE": "paiement pour cette facture", @@ -200,6 +201,7 @@ "REF_GROUP": "Groupe de Réf.", "REMAINING_BALANCE": "Solde restant", "REGISTRATION_NUMBER": "Matricule", + "REGISTERED_BY" : "Enregistrée par", "REGISTERED_ON": "Enregistré le", "RESPONSIBLE": "Responsable", "RESULT": "Résultat", diff --git a/client/src/modules/data_collector_management/data_collector_management.js b/client/src/modules/data_collector_management/data_collector_management.js index b0d1e8828f..95002200fb 100644 --- a/client/src/modules/data_collector_management/data_collector_management.js +++ b/client/src/modules/data_collector_management/data_collector_management.js @@ -53,6 +53,14 @@ function DataCollectorManagementController($state, DataCollectorManagement, Noti headerCellFilter : 'translate', cellTemplate : '/modules/data_collector_management/templates/is_related_patient.cell.html', }, + { + field : 'include_patient_data', + displayName : 'FORM.INFO.INCLUDE_PATIENT_DATA', + width : 300, + enableFiltering : 'true', + headerCellFilter : 'translate', + cellTemplate : '/modules/data_collector_management/templates/include_patient_data.cell.html', + }, { field : 'color', displayName : '', diff --git a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html index 06baddcd51..822601f90b 100644 --- a/client/src/modules/data_collector_management/modals/data_collector_management.modals.html +++ b/client/src/modules/data_collector_management/modals/data_collector_management.modals.html @@ -72,6 +72,22 @@
          + +
          + +
          diff --git a/client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html b/client/src/modules/data_collector_management/templates/include_patient_data.cell.html similarity index 71% rename from client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html rename to client/src/modules/data_collector_management/templates/include_patient_data.cell.html index 48ef2fdbf4..72e7f238ba 100644 --- a/client/src/modules/data_collector_management/templates/is_related_patient.tmpl.html +++ b/client/src/modules/data_collector_management/templates/include_patient_data.cell.html @@ -1,5 +1,5 @@
          -
          +
          FORM.LABELS.YES diff --git a/client/src/modules/display_metadata/display_metadata.js b/client/src/modules/display_metadata/display_metadata.js index a059f6ffc5..6fb405549c 100644 --- a/client/src/modules/display_metadata/display_metadata.js +++ b/client/src/modules/display_metadata/display_metadata.js @@ -86,11 +86,14 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem vm.remove = remove; function edit(data) { - if (vm.hasPatientData) { + if (vm.hasPatientData || data.patient_uuid) { + const includeMedicalSheet = vm.hasPatientData ? 1 : 0; + $state.go('display_metadata.patientEdit', { id : data.data_collector_management_id, uuid : data.uuid, - patient : $state.params.patient, + patient : $state.params.patient || data.patient_uuid, + include : includeMedicalSheet, }); } else { $state.go('display_metadata.edit', { id : data.data_collector_management_id, uuid : data.uuid }); @@ -147,13 +150,13 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem vm.params = { data_collector_management_id : vm.collectorId, + includePatientData : vm.includePatientData, changes : vm.changes, }; SurveyForm.read(null, { data_collector_management_id : vm.collectorId }) .then((survey) => { vm.filterElements.customFilters = DisplayMetadata.displayFilters(survey, vm.changes); - vm.options = { changes : vm.changes, data_collector_management_id : vm.collectorId, @@ -279,9 +282,10 @@ function DisplayMetadataController($state, DisplayMetadata, DataCollectorManagem }; DisplayMetadata.openSearchModal(params) - .then((changes) => { + .then(changes => { if (changes) { vm.collectorId = changes.collectorId; + vm.includePatientData = changes.includePatientData; vm.changes = changes; } diff --git a/client/src/modules/display_metadata/display_metadata.routes.js b/client/src/modules/display_metadata/display_metadata.routes.js index cd04006eef..cdfcbc8337 100644 --- a/client/src/modules/display_metadata/display_metadata.routes.js +++ b/client/src/modules/display_metadata/display_metadata.routes.js @@ -24,7 +24,7 @@ angular.module('bhima.routes') }) .state('display_metadata.patientEdit', { - url : '/:id/:uuid/:patient/edit', + url : '/:id/:uuid/:patient/:include/edit', params : { fill_form : { value : null }, creating : { value : true }, diff --git a/client/src/modules/display_metadata/modals/search.modal.js b/client/src/modules/display_metadata/modals/search.modal.js index c121dc3fa6..541afc610a 100644 --- a/client/src/modules/display_metadata/modals/search.modal.js +++ b/client/src/modules/display_metadata/modals/search.modal.js @@ -54,6 +54,7 @@ function DisplayMetadataSearchModalController( function onSelectSurveyForm(collector) { vm.searchQueries.data_collector_id = collector.id; + vm.include_patient_data = collector.include_patient_data; SurveyForm.read(null, { data_collector_management_id : collector.id }) .then(surveyElements => { @@ -105,6 +106,7 @@ function DisplayMetadataSearchModalController( const allChanges = { loggedChanges : changes.getAll(), collectorId : vm.searchQueries.data_collector_id, + includePatientData : vm.include_patient_data, searchDateFrom : vm.searchDateFrom, searchDateTo : vm.searchDateTo, multipleChoice : vm.multipleChoice, diff --git a/client/src/modules/display_metadata/templates/patient.cell.html b/client/src/modules/display_metadata/templates/patient.cell.html new file mode 100644 index 0000000000..4c2e25e433 --- /dev/null +++ b/client/src/modules/display_metadata/templates/patient.cell.html @@ -0,0 +1,3 @@ +
          + {{ row.entity.patient_name }} +
          diff --git a/client/src/modules/display_metadata/templates/user.cell.html b/client/src/modules/display_metadata/templates/user.cell.html new file mode 100644 index 0000000000..90c99200b9 --- /dev/null +++ b/client/src/modules/display_metadata/templates/user.cell.html @@ -0,0 +1,3 @@ +
          + {{ row.entity.user_name }} +
          diff --git a/client/src/modules/fill_form/modals/fill_form.modals.html b/client/src/modules/fill_form/modals/fill_form.modals.html index b4f8d0c229..459d98c563 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.html +++ b/client/src/modules/fill_form/modals/fill_form.modals.html @@ -19,6 +19,15 @@

          {{ FillFormModalCtrl

          +
          + + + +
          +
          diff --git a/client/src/modules/fill_form/modals/fill_form.modals.js b/client/src/modules/fill_form/modals/fill_form.modals.js index 6186478b8e..c5ae0ced31 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.js +++ b/client/src/modules/fill_form/modals/fill_form.modals.js @@ -16,6 +16,7 @@ function FillFormModalController($state, FillForm, Notify, AppCache, const cache = AppCache('FillFormModalController'); vm.stateParams = {}; + // exposed methods vm.submit = submit; vm.closeModal = closeModal; @@ -27,9 +28,13 @@ function FillFormModalController($state, FillForm, Notify, AppCache, vm.onTimeChange = onTimeChange; vm.onSelectMultiple = onSelectMultiple; vm.setThumbnail = setThumbnail; + vm.setPatient = setPatient; vm.picture = {}; vm.updateMode = false; + vm.selectPatient = false; vm.containtValue = {}; + vm.include_patient_data = 0; + let include = 0; if ($state.params.creating || $state.params.id) { cache.stateParams = $state.params; @@ -38,6 +43,10 @@ function FillFormModalController($state, FillForm, Notify, AppCache, vm.stateParams = cache.stateParams; } + if (vm.stateParams.include) { + include = parseInt(vm.stateParams.include, 0); + } + function onSelectList(list, value) { vm.form[value] = list.id; vm.containtValue[value] = list.label; @@ -56,6 +65,11 @@ function FillFormModalController($state, FillForm, Notify, AppCache, vm.form[time] = timeForm.getHours(); } + // set patient + function setPatient(patient) { + vm.form.patient_uuid = patient.uuid; + } + function uploadImage(file, uuid, key) { file.upload = Upload.upload({ url : `/fill_form/${uuid}/${key}/image`, @@ -105,7 +119,6 @@ function FillFormModalController($state, FillForm, Notify, AppCache, .then(data => { data.forEach(item => { item.valueRequired = item.required ? 'required' : ''; - if (item.default) { vm.form[item.name] = (item.type === '1') ? parseInt(item.default, 10) : item.default; @@ -125,6 +138,10 @@ function FillFormModalController($state, FillForm, Notify, AppCache, return DataCollectorManagement.read(vm.stateParams.id); }) .then(dataCollector => { + if (!vm.stateParams.patient) { + vm.include_patient_data = dataCollector.include_patient_data; + } + vm.dataCollector = dataCollector; }) .catch(Notify.handleError); @@ -154,6 +171,12 @@ function FillFormModalController($state, FillForm, Notify, AppCache, }) .then(dataCollector => { vm.dataCollector = dataCollector; + vm.include_patient_data = dataCollector.include_patient_data; + + if (vm.include_patient_data && !vm.stateParams.patient) { + vm.selectPatient = true; + } + return FillForm.read(vm.stateParams.uuid); }) .then(dataSurvey => { @@ -171,7 +194,7 @@ function FillFormModalController($state, FillForm, Notify, AppCache, if (fillForm.$pristine) { return null; } vm.form.data_collector_management_id = vm.stateParams.id; - if (vm.stateParams.patient) { + if (vm.stateParams.patient && !vm.updateMode) { vm.form.patient_uuid = vm.stateParams.patient; } @@ -207,7 +230,15 @@ function FillFormModalController($state, FillForm, Notify, AppCache, $state.go('fill_form', null, { reload : true }); } else if (!vm.stateParams.patient && vm.updateMode) { $state.go('display_metadata', { id : vm.stateParams.id }, { reload : true }); - } else if (vm.stateParams.patient) { + } else if (vm.stateParams.patient && !vm.updateMode) { + console.log('PATIENT MODE INSERT'); + + + $state.go('display_metadata.patient', + { id : vm.stateParams.id, patient : vm.stateParams.patient }, { reload : true }); + } else if (vm.stateParams.patient && vm.updateMode && !include) { + $state.go('display_metadata', { id : vm.stateParams.id }, { reload : true }); + } else if (vm.stateParams.patient && vm.updateMode && include) { $state.go('display_metadata.patient', { id : vm.stateParams.id, patient : vm.stateParams.patient }, { reload : true }); } diff --git a/client/src/modules/reports/generate/dataKit/dataKit.config.js b/client/src/modules/reports/generate/dataKit/dataKit.config.js index 0338015719..054e0b3a47 100644 --- a/client/src/modules/reports/generate/dataKit/dataKit.config.js +++ b/client/src/modules/reports/generate/dataKit/dataKit.config.js @@ -33,6 +33,8 @@ function DataKitConfigController($sce, Notify, SavedReports, AppCache, reportDat vm.reportDetails.loggedChanges = {}; vm.reportDetails.data_collector_id = collector.id; + vm.reportDetails.includePatientData = collector.include_patient_data; + delete cache.reportDetails; SurveyForm.read(null, { data_collector_management_id : collector.id }) diff --git a/server/controllers/admin/dataCollectorManagement.js b/server/controllers/admin/dataCollectorManagement.js index 48e6f48116..2a442738aa 100644 --- a/server/controllers/admin/dataCollectorManagement.js +++ b/server/controllers/admin/dataCollectorManagement.js @@ -11,7 +11,8 @@ const FilterParser = require('../../lib/filter'); // GET /data_collector_management function lookupDataCollectorManagement(id) { const sql = ` - SELECT id, label, description, version_number, color, is_related_patient FROM data_collector_management + SELECT id, label, description, version_number, color, is_related_patient, include_patient_data + FROM data_collector_management WHERE data_collector_management.id = ? `; @@ -24,15 +25,17 @@ function list(req, res, next) { const filters = new FilterParser(req.query); let dataCollector; - const sql = `SELECT id, label, description, version_number, color, is_related_patient - FROM data_collector_management`; + const sql = ` + SELECT id, label, description, version_number, color, is_related_patient, include_patient_data + FROM data_collector_management + `; filters.equals('label'); filters.equals('description'); filters.equals('version_number'); filters.equals('is_related_patient'); - filters.setOrder('ORDER BY label ASC'); - filters.setOrder('ORDER BY version_number'); + filters.equals('include_patient_data'); + filters.setOrder('ORDER BY label, version_number'); const query = filters.applyQuery(sql); const parameters = filters.parameters(); diff --git a/server/controllers/admin/displayMetadata.js b/server/controllers/admin/displayMetadata.js index 61b24e5624..cdff2a47fc 100644 --- a/server/controllers/admin/displayMetadata.js +++ b/server/controllers/admin/displayMetadata.js @@ -18,6 +18,13 @@ function lookupData(params) { let paramDateTo = {}; let paramsMultipleChoice = {}; const findParameters = {}; + let includePatientData = 0; + + if (params.changes) { + if (params.changes.includePatientData) { + includePatientData = parseInt(params.changes.includePatientData, 10); + } + } if (params.changes) { if (params.changes.searchDateFrom) { @@ -149,22 +156,27 @@ function lookupData(params) { }); const sqlSurveyData = ` - SELECT uuid, transpose.dateSurvey, transpose.data_collector_management_id ${sqlColumn} + SELECT uuid, patient_name, transpose.user_id, transpose.user_name, BUID(patient_uuid) AS patient_uuid, + transpose.dateSurvey, transpose.data_collector_management_id ${sqlColumn} FROM ( - SELECT BUID(sd.uuid) AS uuid, sd.date AS dateSurvey, sd.data_collector_management_id, sd.user_id, + SELECT BUID(sd.uuid) AS uuid, p.display_name AS patient_name, sd.date AS dateSurvey, + sd.data_collector_management_id, sd.user_id, u.display_name AS user_name, BUID(sdi.uuid) AS survey_data_item_uuid, sdi.value, GROUP_CONCAT(IF (clm.label IS NULL, sdi.value, clm.label) SEPARATOR ', ') AS datavalue, sf.id AS survey_form_id, sf.name AS columnName, sf.label AS columnLabel, ms.patient_uuid FROM survey_data AS sd JOIN survey_data_item AS sdi ON sdi.survey_data_uuid = sd.uuid JOIN survey_form AS sf ON sf.id = sdi.survey_form_id + JOIN user AS u ON u.id = sd.user_id LEFT JOIN choices_list_management clm ON (clm.id = sdi.value AND (sf.type = 3 OR sf.type = 4)) LEFT JOIN medical_sheet AS ms ON ms.survey_data_uuid = sd.uuid + LEFT JOIN patient AS p ON p.uuid = ms.patient_uuid WHERE sd.is_deleted <> 1 AND sd.data_collector_management_id = ${params.data_collector_management_id} ${filterPatient} GROUP BY sd.uuid, sf.id ) AS transpose GROUP BY transpose.uuid ${havingCondition} ${filterCondition} + ORDER BY dateSurvey ASC `; return db.exec(sqlSurveyData); @@ -181,6 +193,16 @@ function lookupData(params) { cellTemplate : 'modules/display_metadata/templates/date.cell.html', }); + if (includePatientData) { + columns.push({ + field : 'patient_name', + displayName : 'TABLE.COLUMNS.PATIENT_NAME', + headerCellFilter : 'translate', + cellTemplate : '/modules/display_metadata/templates/patient.cell.html', + statusReport : 1, + }); + } + surveyFormElement.forEach(element => { if (element.type === '8') { columns.push({ @@ -211,14 +233,22 @@ function lookupData(params) { } }); - columns.push({ - field : 'action', - displayName : '', - width : 100, - enableFiltering : 'false', - statusReport : 0, - cellTemplate : '/modules/display_metadata/templates/action.cell.html', - }); + columns.push( + { + field : 'user_name', + displayName : 'TABLE.COLUMNS.REGISTERED_BY', + headerCellFilter : 'translate', + cellTemplate : '/modules/display_metadata/templates/user.cell.html', + statusReport : 1, + }, { + field : 'action', + displayName : '', + width : 100, + enableFiltering : 'false', + statusReport : 0, + cellTemplate : '/modules/display_metadata/templates/action.cell.html', + } + ); const dataSurvey = { columns, diff --git a/server/controllers/admin/fillFormsData.js b/server/controllers/admin/fillFormsData.js index a08bf5e901..89c457f07d 100644 --- a/server/controllers/admin/fillFormsData.js +++ b/server/controllers/admin/fillFormsData.js @@ -13,6 +13,7 @@ const { uuid } = require('../../lib/util'); // POST /fill_from function create(req, res, next) { const data = req.body; + let medicalSheet; const patientUuid = req.body.patient_uuid || null; if (req.body.patient_uuid) { @@ -171,12 +172,22 @@ function lookupFillForm(surveyUuid) { // PUT /fill_form /:uuid function update(req, res, next) { + let medicalSheet; + const dataCollectorManagementId = { data_collector_management_id : req.body.new.data_collector_management_id, }; + if (req.body.new.patient_uuid) { + medicalSheet = { + survey_data_uuid : db.bid(req.params.uuid), + patient_uuid : db.bid(req.body.new.patient_uuid), + }; + } + const newData = req.body.new; const oldData = req.body.old; + const surveyUuid = req.params.uuid; surveyForm.getSurveyFormElement(dataCollectorManagementId) @@ -275,6 +286,13 @@ function update(req, res, next) { const sqlSurveyDataLog = `INSERT INTO survey_data_log (uuid, log_uuid, survey_form_id, survey_form_label, survey_data_uuid, user_id, status, value) VALUES ?`; + const saveLinkSurveyPatient = `INSERT INTO medical_sheet SET ?`; + + if (req.body.new.patient_uuid) { + transaction + .addQuery(saveLinkSurveyPatient, [medicalSheet]); + } + transaction .addQuery(deleteSurveyDataItem, [db.bid(surveyUuid)]) .addQuery(sqlSurveyDataItem, [surveyNewDataItem]) diff --git a/server/controllers/admin/metadataReport/index.js b/server/controllers/admin/metadataReport/index.js index 3cc01515d0..ea77bf8a59 100644 --- a/server/controllers/admin/metadataReport/index.js +++ b/server/controllers/admin/metadataReport/index.js @@ -101,11 +101,17 @@ function metadataCard(req, res, next) { function reportMetadata(req, res, next) { const params = req.query; const filterQuery = []; + const includePatientData = parseInt(params.includePatientData, 10); if (!params.downloadMode) { params.changes = {}; params.changes.loggedChanges = []; + // Include Patient DATA + if (includePatientData) { + params.changes.includePatientData = includePatientData; + } + const queryLength = Object.keys(req.query).length; if (queryLength) { Object.keys(req.query).forEach((key) => { @@ -150,18 +156,19 @@ function reportMetadata(req, res, next) { } } - if (params.filterClient) { + const data = {}; + data.filterQuery = filterQuery; + + if (typeof params.filterClient === 'string') { + const filterClient = JSON.parse(params.filterClient); + data.filterClient = [filterClient]; + } else if (typeof params.filterClient === 'object') { params.filterClient.forEach((item, index) => { params.filterClient[index] = JSON.parse(item); }); + data.filterClient = params.filterClient; } - - const data = {}; - data.filterQuery = filterQuery; - data.filterClient = params.filterClient; - - if (typeof params.patient === 'string') { data.patient = JSON.parse(params.patient); } diff --git a/server/controllers/admin/metadataReport/metadatacard.handlebars b/server/controllers/admin/metadataReport/metadatacard.handlebars index 5490cd7ffa..ac5d8b330f 100644 --- a/server/controllers/admin/metadataReport/metadatacard.handlebars +++ b/server/controllers/admin/metadataReport/metadatacard.handlebars @@ -61,6 +61,18 @@ {{/inequal}} {{/each}} + + + + + {{translate 'TABLE.COLUMNS.REGISTERED_BY'}} + + + + + + {{ survey.userName }} +
          diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index b625f8f23f..905ba1fa69 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -26,6 +26,7 @@ CREATE TABLE `data_collector_management` ( `version_number` INT(11) UNSIGNED NOT NULL, `color` VARCHAR(8) NULL, `is_related_patient` TINYINT(1) NOT NULL DEFAULT 0, + `include_patient_data` TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; diff --git a/server/models/schema.sql b/server/models/schema.sql index 0c57d52cdd..e1b41780ca 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -2368,6 +2368,7 @@ CREATE TABLE `data_collector_management` ( `version_number` INT(11) UNSIGNED NOT NULL, `color` VARCHAR(8) NULL, `is_related_patient` TINYINT(1) NOT NULL DEFAULT 0, + `include_patient_data` TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), UNIQUE KEY `data_collector_management_1` (`label`, `version_number`) ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci; diff --git a/test/data.sql b/test/data.sql index 05163449a4..3d3bc1c283 100644 --- a/test/data.sql +++ b/test/data.sql @@ -1109,8 +1109,8 @@ INSERT INTO `distribution_key` (`id`, `auxiliary_fee_center_id`, `principal_fee_ INSERT INTO `distribution_key` (`id`, `auxiliary_fee_center_id`, `principal_fee_center_id`, `rate`, `user_id`) VALUES (3, 4, 3, 20.00, 1); -- data_collector_management -INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES (1, 'Fiche Kardex', 'Fiche de consommation Medicament', 1, '#E0FFFF', 1); -INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`) VALUES (3, 'Formulaire Special', NULL, 1, '#EE82EE', 0); +INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`, `include_patient_data`) VALUES (1, 'Fiche Kardex', 'Fiche de consommation Medicament', 1, '#E0FFFF', 1, 1); +INSERT INTO `data_collector_management` (`id`, `label`, `description`, `version_number`, `color`, `is_related_patient`, `include_patient_data`) VALUES (3, 'Formulaire Special', NULL, 1, '#EE82EE', 0, 0); -- choices_list_management INSERT INTO `choices_list_management` (`id`, `name`, `label`, `fixed`, `parent`, `group_label`, `is_group`, `is_title`) VALUES (1, 'genre', 'Genre', 0, 0, 0, 1, 1); diff --git a/test/end-to-end/fillForm/fillForm.page.js b/test/end-to-end/fillForm/fillForm.page.js index d7129d0a18..3c13334aed 100644 --- a/test/end-to-end/fillForm/fillForm.page.js +++ b/test/end-to-end/fillForm/fillForm.page.js @@ -35,7 +35,7 @@ class FillFormManagementPage { async createComplexe(fillForm) { await element(by.id('form_1')).click(); - + await components.findPatient.findByName(fillForm.patientName); await components.choiceListSelect.set(fillForm.choice_list_id, 'label'); await browser.findElement(by.css('[name="poids"]')).sendKeys(fillForm.poids); await browser.findElement(by.css('[name="dosekilos"]')).sendKeys(fillForm.dosekilos); diff --git a/test/end-to-end/fillForm/fillForm.spec.js b/test/end-to-end/fillForm/fillForm.spec.js index 7811f63cc6..b510262cbe 100644 --- a/test/end-to-end/fillForm/fillForm.spec.js +++ b/test/end-to-end/fillForm/fillForm.spec.js @@ -18,6 +18,7 @@ describe('Fill Form Management', () => { }; const newSurveyData2 = { + patientName : 'Employee Test 1', choice_list_id : 'Paracetamol500 mg', poids : 45, dosekilos : '2', diff --git a/test/integration/dataCollectorManagement.js b/test/integration/dataCollectorManagement.js index 9a942a2aa4..14888b8600 100644 --- a/test/integration/dataCollectorManagement.js +++ b/test/integration/dataCollectorManagement.js @@ -10,12 +10,14 @@ describe('(/data_collector_management) Data Collector Management', () => { version_number : '1', color : '#ADD8E6', is_related_patient : '1', + include_patient_data : '1', }; const updateAccountReferenceType = { label : 'Consultations aux urgences', version_number : '1', is_related_patient : '0', + include_patient_data : '0', }; it('POST /data_collector_management add Data Collector Management', () => { @@ -35,7 +37,7 @@ describe('(/data_collector_management) Data Collector Management', () => { expect(res).to.be.a('object'); expect(res.body).to.have.all.keys('id', 'label', 'description', - 'version_number', 'color', 'is_related_patient'); + 'version_number', 'color', 'is_related_patient', 'include_patient_data'); }) .catch(helpers.handler); }); @@ -56,7 +58,7 @@ describe('(/data_collector_management) Data Collector Management', () => { .then((res) => { helpers.api.listed(res, numDataCollector); expect(res.body[0]).to.have.all.keys('id', 'label', 'description', - 'version_number', 'color', 'is_related_patient', 'number_submissions'); + 'version_number', 'color', 'is_related_patient', 'include_patient_data', 'number_submissions'); }) .catch(helpers.handler); }); From 4487468907aebfeef3ea0aec063cad20925a5b58 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 25 Oct 2019 12:54:06 +0100 Subject: [PATCH 28/30] test(Validation configuration form survey) - Implementation of a service to validate the variable name parameter when configuring forms, - Implementation of the unit test for the validation of the variable parameter name - Implementation of the E2E test for the validation of the variable name parameter when configuring formulators --- client/src/i18n/en/form.json | 1 + client/src/i18n/fr/form.json | 1 + .../modules/fill_form/fill_form.service.js | 15 +++- .../fill_form/modals/fill_form.modals.js | 3 - .../modals/survey_form.modals.html | 7 +- .../survey_form/modals/survey_form.modals.js | 15 +++- .../survey_form/survey_form.service.js | 14 ++++ .../services/FillFormService.spec.js | 31 ++++++++ .../services/SurveyFormService.spec.js | 78 +++++++++++++++++++ test/end-to-end/surveyForm/surveyForm.page.js | 18 +++++ test/end-to-end/surveyForm/surveyForm.spec.js | 32 ++++++++ 11 files changed, 206 insertions(+), 9 deletions(-) create mode 100644 test/client-unit/services/FillFormService.spec.js create mode 100644 test/client-unit/services/SurveyFormService.spec.js diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json index b457b503d1..c2aefb5415 100644 --- a/client/src/i18n/en/form.json +++ b/client/src/i18n/en/form.json @@ -921,6 +921,7 @@ "DATE_REQUIRED": "This date is required.", "EMAIL": "Email mistyped", "EXCEPTION": "There was a problem validating this field. Please check your internet connection.", + "FORMAT_NAME_VARIABLE": "a variable name must start with a letter (uppercase or lowercase) and can only contain letters, numbers, and _ or - characters, spaces and special characters are not allowed!", "INTEGER": "This value must be a whole number (integer).", "INVALID_DATE": "Invalid date", "MAX": "This value is too large! Choose a lower value.", diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json index de183568e7..3b7b9fcadf 100644 --- a/client/src/i18n/fr/form.json +++ b/client/src/i18n/fr/form.json @@ -922,6 +922,7 @@ "DATE_REQUIRED": "Cette date est nécessaire.", "EMAIL": "Email mal saisie", "EXCEPTION": "Il y avait un problème de validation avec ce champ. S'il vous plaît vérifier votre connexion Internet.", + "FORMAT_NAME_VARIABLE": "un nom de variable doit commencer par une lettre (majuscule ou minuscule) et ne peut contenir que des lettres, des chiffres et les caractères _ ou -, les espaces et les caractères spéciaux ne sont pas autorisés!", "INTEGER": "Cette valeur doit être un nombre entier (Entier).", "INVALID_DATE": "Date invalide", "MAX": "Cette valeur est trop grande! Choisissez une valeur inférieure.", diff --git a/client/src/modules/fill_form/fill_form.service.js b/client/src/modules/fill_form/fill_form.service.js index dc7ca2d63d..9425f068c5 100644 --- a/client/src/modules/fill_form/fill_form.service.js +++ b/client/src/modules/fill_form/fill_form.service.js @@ -75,16 +75,25 @@ function FillFormService(Api) { */ function formatConstraint(constraint) { + let constaintFormated; + // valueA format the constaint for input type text and number - let valueA = constraint.replace(/.{/g, 'FillFormModalCtrl.form.'); + let valueA = constraint.replace(/.{/g, `FillFormModalCtrl.form.`); valueA = valueA.replace(/}/g, ''); // valueB format the contraint for input type select one - let valueB = constraint.replace(/.{/g, 'FillFormModalCtrl.containtValue.'); + let valueB = constraint.replace(/.{/g, `FillFormModalCtrl.containtValue.`); valueB = valueB.replace(/}/g, ''); - return `(${valueA}) || (${valueB})` || null; + const checkValidConstraint = /.{/; + + if (checkValidConstraint.test(constraint)) { + constaintFormated = `(${valueA}) || (${valueB})`; + } else { + constaintFormated = null; + } + return constaintFormated; } return service; diff --git a/client/src/modules/fill_form/modals/fill_form.modals.js b/client/src/modules/fill_form/modals/fill_form.modals.js index c5ae0ced31..11be56e0be 100644 --- a/client/src/modules/fill_form/modals/fill_form.modals.js +++ b/client/src/modules/fill_form/modals/fill_form.modals.js @@ -231,9 +231,6 @@ function FillFormModalController($state, FillForm, Notify, AppCache, } else if (!vm.stateParams.patient && vm.updateMode) { $state.go('display_metadata', { id : vm.stateParams.id }, { reload : true }); } else if (vm.stateParams.patient && !vm.updateMode) { - console.log('PATIENT MODE INSERT'); - - $state.go('display_metadata.patient', { id : vm.stateParams.id, patient : vm.stateParams.patient }, { reload : true }); } else if (vm.stateParams.patient && vm.updateMode && !include) { diff --git a/client/src/modules/survey_form/modals/survey_form.modals.html b/client/src/modules/survey_form/modals/survey_form.modals.html index 869ba4d94a..1c0d2eff50 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.html +++ b/client/src/modules/survey_form/modals/survey_form.modals.html @@ -102,13 +102,16 @@

          -
          +
          - +
          +
          +

          FORM.VALIDATION.FORMAT_NAME_VARIABLE

          +
          diff --git a/client/src/modules/survey_form/modals/survey_form.modals.js b/client/src/modules/survey_form/modals/survey_form.modals.js index 08d4ec9859..283eaff990 100644 --- a/client/src/modules/survey_form/modals/survey_form.modals.js +++ b/client/src/modules/survey_form/modals/survey_form.modals.js @@ -23,6 +23,8 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol vm.selectType = selectType; vm.onSelectList = onSelectList; vm.onSelectSurvey = onSelectSurvey; + vm.checkVariableName = checkVariableName; + vm.check = true; function selectType(type) { vm.surveyForm.type = type.id; @@ -38,6 +40,12 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol vm.surveyForm.filter_choice_list_id = survey.id; } + function checkVariableName() { + if (vm.surveyForm.name) { + vm.check = SurveyForm.validVariable(vm.surveyForm.name); + } + } + if ($state.params.collectorId) { vm.surveyForm.data_collector_management_id = $state.params.collectorId; @@ -61,6 +69,8 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol .then(data => { vm.selectList = data.choice_list_id; vm.surveyForm = data; + + vm.check = SurveyForm.validVariable(vm.surveyForm.name); }) .catch(Notify.handleError); } @@ -75,13 +85,16 @@ function SurveyFormModalController($state, SurveyForm, Notify, AppCache, DataCol // submit the data to the server from all two forms (update, create) function submit(surveyForm) { vm.hasNoChange = surveyForm.$submitted && surveyForm.$pristine && !vm.isCreating; - if (surveyForm.$invalid) { return null; } + + if (surveyForm.$invalid || !vm.check) { return null; } if (surveyForm.$pristine) { return null; } if (parseInt(vm.surveyForm.type, 10) !== 9) { vm.surveyForm.calculation = null; } + vm.surveyForm.name = vm.surveyForm.name.trim(); + const promise = (vm.isCreating) ? SurveyForm.create(vm.surveyForm) : SurveyForm.update(vm.surveyForm.id, vm.surveyForm); diff --git a/client/src/modules/survey_form/survey_form.service.js b/client/src/modules/survey_form/survey_form.service.js index 8ac6f272ad..307bdde0c9 100644 --- a/client/src/modules/survey_form/survey_form.service.js +++ b/client/src/modules/survey_form/survey_form.service.js @@ -13,11 +13,25 @@ SurveyFormService.$inject = ['PrototypeApiService']; function SurveyFormService(Api) { const service = new Api('/survey_form/'); service.listSurveyformtype = listSurveyformtype; + service.validVariable = validVariable; function listSurveyformtype() { const url = ''.concat('listSurveyformtype'); return Api.read.call(service, url); } + function validVariable(variable) { + // Regular expression to check if a variable starts only with a string of characters + const startString = /^[a-zA-Z]/; + + // Regular expression to check if a variable does not have special characters + const haventSpecial = /^[\w \-]+$/; + + // Regular expression to check if Matches a blank (this includes space, tab, line break, or page break). + const haveSpaceTabulation = /[\s]/; + + return (startString.test(variable) && haventSpecial.test(variable) && !(haveSpaceTabulation.test(variable))); + } + return service; } diff --git a/test/client-unit/services/FillFormService.spec.js b/test/client-unit/services/FillFormService.spec.js new file mode 100644 index 0000000000..06da4583d4 --- /dev/null +++ b/test/client-unit/services/FillFormService.spec.js @@ -0,0 +1,31 @@ +/* global expect inject */ +describe('FillFormService', () => { + let FillFormService; + let $httpBackend; + + beforeEach(module( + 'bhima.services', + 'angularMoment', + 'bhima.mocks', + 'ngStorage' + )); + + beforeEach(inject((_FillFormService_, _$httpBackend_) => { + FillFormService = _FillFormService_; + $httpBackend = _$httpBackend_; + })); + + afterEach(() => { + $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingRequest(); + }); + + it('Verification of the formatting of the contrains defined during the filling of the forms', () => { + // This is the value to get + const value = '(FillFormModalCtrl.form.nombre_femme < 25) || (FillFormModalCtrl.containtValue.nombre_femme < 25)'; + + const formatedConstaint = FillFormService.formatConstraint('.{nombre_femme} < 25'); + + expect(formatedConstaint).to.equal(value); + }); +}); diff --git a/test/client-unit/services/SurveyFormService.spec.js b/test/client-unit/services/SurveyFormService.spec.js new file mode 100644 index 0000000000..ae218ba065 --- /dev/null +++ b/test/client-unit/services/SurveyFormService.spec.js @@ -0,0 +1,78 @@ +/* global expect inject */ +describe('SurveyFormService', () => { + let SurveyFormService; + let $httpBackend; + + beforeEach(module( + 'bhima.services', + 'angularMoment', + 'bhima.mocks', + 'ngStorage' + )); + + beforeEach(inject((_SurveyFormService_, _$httpBackend_) => { + SurveyFormService = _SurveyFormService_; + $httpBackend = _$httpBackend_; + })); + + afterEach(() => { + $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingRequest(); + }); + + it('Invalidating the name parameter when the variable name has voids', () => { + // This is the value to get + const variableName = 'Validation Variable Name'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(false); + }); + + it('Failed to create a form element whose name parameter with virgul', () => { + // This is the value to get + const variableName = 'Namewith,and;'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(false); + }); + + it('Failed to create a form element whose name parameter with @', () => { + // This is the value to get + const variableName = 'Namewith@'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(false); + }); + + it('Failed to create a form element whose name parameter with Quotation mark and apostrophe', () => { + // This is the value to get + const variableName = 'Namewith\'and\"'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(false); + }); + + it('Failed to create a form element whose name parameter with Quotation mark and apostrophe', () => { + // This is the value to get + const variableName = 'Namewith()'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + expect(formatedConstaint).to.equal(false); + }); + + it('Failed to create a form element whose name parameter with name Begin by Number', () => { + // This is the value to get + const variableName = '1_name'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(false); + }); + + it('Validation of the name parameter with a very good format', () => { + // This is the value to get + const variableName = 'name_patient'; + const formatedConstaint = SurveyFormService.validVariable(variableName); + + expect(formatedConstaint).to.equal(true); + }); + +}); diff --git a/test/end-to-end/surveyForm/surveyForm.page.js b/test/end-to-end/surveyForm/surveyForm.page.js index d6f463c7bd..39c7672490 100644 --- a/test/end-to-end/surveyForm/surveyForm.page.js +++ b/test/end-to-end/surveyForm/surveyForm.page.js @@ -7,6 +7,7 @@ */ /* loading grid actions */ +const { expect } = require('chai'); const GridRow = require('../shared/GridRow'); const FU = require('../shared/FormUtils'); const components = require('../shared/components'); @@ -33,9 +34,26 @@ class SurveyFormManagementPage { await components.notification.hasSuccess(); } + /** + * Verify the validation of the parameter name for several scenarios + */ + async checkValidate(SurveyForm, surveyFormName) { + await components.dataCollector.set(SurveyForm.dataCollector); + await FU.buttons.create(); + await components.surveyFormTypeSelect.set(SurveyForm.type); + await FU.input('SurveyFormModalCtrl.surveyForm.name', surveyFormName); + await FU.input('SurveyFormModalCtrl.surveyForm.label', SurveyForm.label); + await FU.input('SurveyFormModalCtrl.surveyForm.hint', SurveyForm.hint); + await element(by.id('is_required')).click(); + await FU.buttons.submit(); + await FU.exists(by.id('error_format'), true); + await FU.modal.cancel(); + } + /** * simulate the create Survey Form button click to show the dialog of creation */ + async createDeletable(SurveyForm) { await FU.buttons.create(); await components.surveyFormTypeSelect.set(SurveyForm.type); diff --git a/test/end-to-end/surveyForm/surveyForm.spec.js b/test/end-to-end/surveyForm/surveyForm.spec.js index 40460e16f5..537b60cced 100644 --- a/test/end-to-end/surveyForm/surveyForm.spec.js +++ b/test/end-to-end/surveyForm/surveyForm.spec.js @@ -15,6 +15,18 @@ describe('Survey Form Management', () => { hint : 'Veuillez renseigner le nom de l\' image', }; + const checkValidationName = { + dataCollector : 'Fiche Kardex', + type : 'Image', + label : 'Validation Variable Name', + name1 : 'Name with space', + name2 : 'Namewith,and;', + name3 : 'Namewith@', + name4 : 'Namewith\'and\"', + name5 : 'Namewith()', + hint : 'Veuillez renseigner le nom de l\' image', + }; + // Sélection Multiple const updateSurveyFormElement = { @@ -37,6 +49,26 @@ describe('Survey Form Management', () => { await Page.create(newSurveyFormElement); }); + it('Failed to create a form element whose name parameter with space', async () => { + await Page.checkValidate(checkValidationName, checkValidationName.name1); + }); + + it('Failed to create a form element whose name parameter with virgul', async () => { + await Page.checkValidate(checkValidationName, checkValidationName.name2); + }); + + it('Failed to create a form element whose name parameter with @ ', async () => { + await Page.checkValidate(checkValidationName, checkValidationName.name3); + }); + + it('Failed to create a form element whose name parameter with Quotation mark and apostrophe ', async () => { + await Page.checkValidate(checkValidationName, checkValidationName.name4); + }); + + it('Failed to create a form element whose name parameter with parenthesis ', async () => { + await Page.checkValidate(checkValidationName, checkValidationName.name5); + }); + it('successfully edits a Survey Form Element', async () => { await Page.edit(newSurveyFormElement.label, updateSurveyFormElement); }); From 7ca503e1db3752f5695888a3f8051da363e03d5f Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 25 Oct 2019 13:45:54 +0100 Subject: [PATCH 29/30] Sanitaze and clear code --- client/src/js/services/FormatTreeDataService.js | 2 +- .../analysisAuxiliaryCash/analysisAuxiliaryCash.config.js | 7 ++++--- client/src/modules/survey_form/survey_form.service.js | 2 +- test/end-to-end/surveyForm/surveyForm.page.js | 1 - test/end-to-end/surveyForm/surveyForm.spec.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/js/services/FormatTreeDataService.js b/client/src/js/services/FormatTreeDataService.js index 5729a4b61d..b2f193953a 100644 --- a/client/src/js/services/FormatTreeDataService.js +++ b/client/src/js/services/FormatTreeDataService.js @@ -7,7 +7,7 @@ FormatTreeDataService.$inject = []; * @class FormatTreeDataService * */ -function FormatTreeDataService(Api) { +function FormatTreeDataService() { const service = this; service.formatStore = formatStore; diff --git a/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js b/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js index 5d6b8755aa..4bc8fd7e95 100644 --- a/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js +++ b/client/src/modules/reports/generate/analysisAuxiliaryCash/analysisAuxiliaryCash.config.js @@ -2,11 +2,12 @@ angular.module('bhima.controllers') .controller('analysisAuxiliaryCashController', AnalysisAuxiliaryCashController); AnalysisAuxiliaryCashController.$inject = [ - '$sce', 'NotifyService', 'BaseReportService', 'AppCache', 'reportData', '$state', 'AccountService', - 'FormatTreeDataService', + '$sce', 'NotifyService', 'BaseReportService', 'AppCache', + 'reportData', '$state', 'AccountService', 'FormatTreeDataService', ]; -function AnalysisAuxiliaryCashController($sce, Notify, SavedReports, AppCache, reportData, $state, Accounts, FormatTreeData) { +function AnalysisAuxiliaryCashController($sce, Notify, SavedReports, AppCache, + reportData, $state, Accounts, FormatTreeData) { const vm = this; const cache = new AppCache('analysisAuxiliaryCash'); const reportUrl = 'reports/finance/analysis_auxiliary_cashbox'; diff --git a/client/src/modules/survey_form/survey_form.service.js b/client/src/modules/survey_form/survey_form.service.js index 307bdde0c9..e5c158344c 100644 --- a/client/src/modules/survey_form/survey_form.service.js +++ b/client/src/modules/survey_form/survey_form.service.js @@ -25,7 +25,7 @@ function SurveyFormService(Api) { const startString = /^[a-zA-Z]/; // Regular expression to check if a variable does not have special characters - const haventSpecial = /^[\w \-]+$/; + const haventSpecial = /^[\w -]+$/; // Regular expression to check if Matches a blank (this includes space, tab, line break, or page break). const haveSpaceTabulation = /[\s]/; diff --git a/test/end-to-end/surveyForm/surveyForm.page.js b/test/end-to-end/surveyForm/surveyForm.page.js index 39c7672490..36a4ac6a38 100644 --- a/test/end-to-end/surveyForm/surveyForm.page.js +++ b/test/end-to-end/surveyForm/surveyForm.page.js @@ -7,7 +7,6 @@ */ /* loading grid actions */ -const { expect } = require('chai'); const GridRow = require('../shared/GridRow'); const FU = require('../shared/FormUtils'); const components = require('../shared/components'); diff --git a/test/end-to-end/surveyForm/surveyForm.spec.js b/test/end-to-end/surveyForm/surveyForm.spec.js index 537b60cced..176cf54f28 100644 --- a/test/end-to-end/surveyForm/surveyForm.spec.js +++ b/test/end-to-end/surveyForm/surveyForm.spec.js @@ -22,7 +22,7 @@ describe('Survey Form Management', () => { name1 : 'Name with space', name2 : 'Namewith,and;', name3 : 'Namewith@', - name4 : 'Namewith\'and\"', + name4 : 'Namewith\'and "', name5 : 'Namewith()', hint : 'Veuillez renseigner le nom de l\' image', }; From 6452e5354889fc60bab894646a05b605bccea054 Mon Sep 17 00:00:00 2001 From: Chris Lomame Date: Fri, 25 Oct 2019 14:00:59 +0100 Subject: [PATCH 30/30] Sanitaze and Clear Code --- client/src/modules/accounts/accounts.js | 3 +-- test/client-unit/services/SurveyFormService.spec.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/src/modules/accounts/accounts.js b/client/src/modules/accounts/accounts.js index ac99228aeb..0b2089bdf8 100644 --- a/client/src/modules/accounts/accounts.js +++ b/client/src/modules/accounts/accounts.js @@ -4,7 +4,6 @@ angular.module('bhima.controllers') AccountsController.$inject = [ '$rootScope', '$timeout', 'AccountGridService', 'NotifyService', 'bhConstants', 'LanguageService', 'uiGridConstants', 'ModalService', 'AccountService', '$state', - 'FormatTreeDataService', ]; /** @@ -19,7 +18,7 @@ AccountsController.$inject = [ */ function AccountsController( $rootScope, $timeout, AccountGrid, Notify, Constants, Language, - uiGridConstants, Modal, Accounts, FormatTreeData + uiGridConstants, Modal, Accounts ) { const vm = this; const columns = gridColumns(); diff --git a/test/client-unit/services/SurveyFormService.spec.js b/test/client-unit/services/SurveyFormService.spec.js index ae218ba065..f8e7ee6e1f 100644 --- a/test/client-unit/services/SurveyFormService.spec.js +++ b/test/client-unit/services/SurveyFormService.spec.js @@ -46,7 +46,7 @@ describe('SurveyFormService', () => { it('Failed to create a form element whose name parameter with Quotation mark and apostrophe', () => { // This is the value to get - const variableName = 'Namewith\'and\"'; + const variableName = 'Namewith\'and "'; const formatedConstaint = SurveyFormService.validVariable(variableName); expect(formatedConstaint).to.equal(false);