Skip to content

Commit

Permalink
Merge #3864
Browse files Browse the repository at this point in the history
3864: Bhima data collector r=jniles a=lomamech

- Implente Client side for Data Collector
- Implete API for Data Collector Management
- Extend service color js adding new color
- Implement integration test for dataCollectorManagement
- Implement E2E test for dataCollectorManagement

This module makes it possible to configure the different types of the
choice lists, the lists of choices can be in the form of trees.
- Implement client side of choice list management
- Implement API for choice list Management
- Add integration and E2E for choice List Management

This module allows to add the elements of the form of a data collector,
the elements of a form have a type, some elements can have filter
compared to other elements
- Add new component for Data Collector
- Add new component for select Survey Form Type Select
- Add new component for Select Survey List Select
- Implement client side for Survey Form management
- Implement API for survey form manangement
- Add Integration and End to End test for Survey Form management

- Implementation of APIs related to the filling of forms as well as the
  display of survey data,

- Implementation of links between patient-related forms on the patient
  management page,

- Implementing the data collection report with a small search engine

- Implementation of components for Choicelist Multipke Select, Patient
  Medical Sheet, Survey Form Select,

- Adding Integration and End to End test for Displaying Metadata and
  Filling of survey Form

closes #3863


Co-authored-by: Chris Lomame <lomamech@gmail.com>
  • Loading branch information
bors[bot] and lomamech authored Oct 29, 2019
2 parents 1b88e1c + 6452e53 commit e2f137d
Show file tree
Hide file tree
Showing 133 changed files with 7,907 additions and 126 deletions.
35 changes: 34 additions & 1 deletion client/src/i18n/en/form.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -175,12 +177,16 @@
"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?",
"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",
Expand Down Expand Up @@ -209,6 +215,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",
Expand Down Expand Up @@ -296,6 +303,7 @@
"ON": "On",
"BY_ID": "By Id",
"BY_NAME": "By Name",
"CALCULATION": "Calculation",
"CAN_EDIT_ROLES" : "Ability to edit roles",
"CANCEL": "Cancel",
"CANCELED": "Canceled",
Expand All @@ -311,6 +319,9 @@
"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",
"CLIENT_TO_IGNORE": "Client(s) to ignore",
Expand All @@ -319,6 +330,7 @@
"COLUMNS": "Columns",
"COMMENT": "Comment",
"CONFIRMATION": "Confirmation",
"CONSTRAINT": "Constraint",
"CONTACT": "Contact",
"CONTACT_ADMIN": "Please contact the administrator",
"CONVERSION_RATE": "Conversion rate",
Expand Down Expand Up @@ -360,6 +372,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",
Expand All @@ -369,7 +383,6 @@
"DESIGNATION": "Designation",
"DETAIL_PREVIOUS": "Previous Year Details",
"DETAILS": "Details",
"DEFAULTS": "Default Filters",
"SEARCH_QUERIES": "Search Queries",
"DEBTOR_CREDITOR": "Debtor/Creditor",
"DELAY": "Delay",
Expand Down Expand Up @@ -411,6 +424,7 @@
"FAX": "Fax",
"FEMALE": "Female",
"FIXED_CHARGE": "Fixed Cost",
"FORM": "Form",
"RECORDS": "Records (Rows)",
"FILE_NAME": "File Name",
"HEALTH_ZONE":"Health Zone",
Expand Down Expand Up @@ -451,7 +465,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",
Expand Down Expand Up @@ -501,6 +517,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",
Expand All @@ -527,6 +544,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",
Expand Down Expand Up @@ -587,6 +605,7 @@
"PROFIT_CENTER": "Profit Center",
"PROJECT": "Project",
"PROVINCE": "Province",
"RANK": "Rank",
"RATE": "Rate",
"RUBRICS": "rubrics",
"RECIPIENT": "Recipient",
Expand All @@ -599,6 +618,7 @@
"REGISTRATION_NUMBER": "Registration number",
"RELIGION": "Religion",
"RESPONSABILITY" : "Responsability",
"REQUIRED": "Required",
"RESULT": "Results",
"RESULT_ACCOUNT_SCT": "Result Account section",
"RETYPE": "Retype",
Expand All @@ -611,6 +631,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",
Expand Down Expand Up @@ -645,10 +667,12 @@
"TEL": "TEL",
"TELEPHONE": "Telephone",
"TEXT": "Text",
"TEXT_AREA": "Text area",
"THIS_MONTH": "This Month",
"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",
Expand Down Expand Up @@ -705,7 +729,9 @@
"INDICATOR_HOSPITALIZATION" : "Indicator's hospitalization",
"VALUE": "Value",
"VARIABLE_CHARGE": "Variable cost",
"VARIABLE_NAME": "Variable Name",
"VARIANCE" : "Variance",
"VERSION": "Version",
"VILLAGE": "Village/Township",
"VILLAGE_NAME": "Village/Township Name",
"VILLE": "Township/Commune",
Expand Down Expand Up @@ -773,6 +799,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",
Expand Down Expand Up @@ -863,6 +890,10 @@
"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",
"SERVICE": "Select a Service",
"SEX": "Select a Sex",
Expand All @@ -871,6 +902,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",
Expand All @@ -889,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.",
Expand Down
3 changes: 3 additions & 0 deletions client/src/i18n/en/table.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -160,6 +161,7 @@
"OF": "of",
"PASSIVE": "Passive",
"PATIENT": "Patient",
"PATIENT_NAME": "Patient Name",
"PATIENT_ID": "ID Patient",
"PAYSLIP": "Payslip",
"PAYROLL_BULLETINS": "Payroll Bulletins",
Expand Down Expand Up @@ -198,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",
Expand Down
9 changes: 9 additions & 0 deletions client/src/i18n/en/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,22 @@
"CASHFLOW_BY_SERVICE" : "Cashflow by Service",
"CASH_PAYMENT_REGISTRY" : "Cash Payment Registry",
"CASH_WINDOW" : "Cash Window",
"CHOICES_LIST_MANAGEMENT" : "Choices List Management",
"COMPLEX_JOURNAL_VOUCHER" : "Journal Vouchers",
"COST_CENTER_MGMT" : "Cost Center Management",
"CREDIT_NOTE" : "Credit Note",
"CREDITOR_GROUP" : "Creditor Group Management",
"CURRENCY" : "Currency",
"DATA_COLLECTION": "Data Collection",
"FORMS_MANAGEMENT": "Forms 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",
Expand All @@ -42,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",
Expand Down Expand Up @@ -126,6 +133,8 @@
"STOCK_MOVEMENTS" : "Stock Movements",
"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",
Expand Down
Loading

0 comments on commit e2f137d

Please sign in to comment.