Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Design patient registry #377

Merged
merged 6 commits into from
May 4, 2016
Merged

Design patient registry #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fa0596
Adding unit patient search and showing the data in a UI GRID
lomamech May 3, 2016
3654fff
Adding test E2E for research patient
lomamech May 3, 2016
90c4c8d
Improving the test E2E for Patient Registry and Adding an ID on the U…
lomamech May 3, 2016
308fefc
Update some test E2E
lomamech May 3, 2016
f1fef1c
Improve patient registry
lomamech May 4, 2016
82dae7d
Complete translate liste
lomamech May 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 38 additions & 25 deletions client/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@
"ER_ROW_IS_REFERENCED_2" : "Cannot delete entry since it has been used in a transaction."
},
"DEBTOR_GRP": {
"BACK" : "Back to Debtor Groups",
"CREATE" : "Create Debtor Group",
"CREATE_ANOTHER" : "Create another Debtor Group",
"CREATED" : "Debtor group recorded successfully",
"EDIT" : "Edit Debtor Group",
"GROUPS" : "Debtor Groups",
"HELP_TXT_1" : "This interface allows you to review, find, and configure debtor groups",
Expand All @@ -113,13 +117,6 @@
"INFO" : "Group Information",
"NEW" : "Add a Debtor Group",
"NEW_DEBTOR_GRP" : "New Debtor Group",
"TITLE" : "Debtor Group Management",
"SUBSCRIBED" : "Debtors subscribed",
"BACK" : "Back to Debtor Groups",
"CREATE" : "Create Debtor Group",
"CREATE_ANOTHER" : "Create another Debtor Group",
"CREATED" : "Debtor group recorded successfully",
"UPDATED" : "Debtor group record updated",
"POLICIES" : {
"TITLE" : "Group Policies",
"SUBSIDIES" : {
Expand All @@ -137,7 +134,10 @@
"INFO" : "With this configuration option checked all members of this debtor group will be exempt from paying automatically applied billing services",
"LABEL" : "This group is exempt from paying billing services"
}
}
},
"TITLE" : "Debtor Group Management",
"SUBSCRIBED" : "Debtors subscribed",
"UPDATED" : "Debtor group record updated"
},
"DEPOT": {
"ADD_DEPOT" : "Add a Depot",
Expand Down Expand Up @@ -179,9 +179,9 @@
"TITLE" : "Enterprise Management"
},
"ERRORS": {
"ERR_INTERNET_DISCONNECTED" : "You are not connected to the network.",
"NO_EXCHANGE_RATE" : "No Exchange rate defined",
"UNAUTHORIZED" : "Unauthorized",
"ERR_INTERNET_DISCONNECTED" : "You are not connected to the network."
"UNAUTHORIZED" : "Unauthorized"
},
"EXCHANGE": {
"ADDING_RATE" : "Adding an exchange Rate",
Expand Down Expand Up @@ -446,9 +446,9 @@
"ENTER_SECTOR" : "Enter sector",
"ENTER_USERNAME" : "Enter username",
"ENTER_VILLAGE" : "Enter village",
"FILTER_NAME" : "Filter by name...",
"SEARCH_NAME" : "Search by Name",
"SEARCH_PATIENT_ID" : "Search by Patient ID",
"FILTER_NAME" : "Filter by name..."
"SEARCH_PATIENT_ID" : "Search by Patient ID"
},
"SELECTS": {
"EMPTY" : "Empty",
Expand Down Expand Up @@ -565,6 +565,15 @@
"TITLE" : "Title",
"VIEW_PATIENT_RECORDS" : "View Patient Records"
},
"PATIENT_REGISTRY" : {
"DAY" : "day",
"DAYS" : "days",
"MONTH" : "month",
"MONTHS" : "months",
"YEAR_OLD" : "year old",
"YEARS_OLD" : "years old",
"TITLE" : "Patients Registry"
},
"PERMISSIONS": {
"ADDING_USER" : "Add a user",
"ADD_USER" : "Add a New User",
Expand All @@ -584,11 +593,11 @@
"ITEMS" : "Items",
"NEW_PRICE_LIST" : "New Price List",
"NO_RECORDS" : "No Records",
"NONE" : "Apply no price list",
"PRICE_LIST_ITEMS" : "Price list items",
"TITLE" : "Price List Management",
"UNABLE_TO_DELETE" : "Price list cannot be deleted - it may currently be assigned to patient/ debtor groups",
"UPDATE" : "Update a Price List",
"NONE" : "Apply no price list"
"UPDATE" : "Update a Price List"
},
"PROJECT": {
"ADDING_PROJECT" : "Adding a new project",
Expand Down Expand Up @@ -693,6 +702,7 @@
"ABBREVIATION" : "Abbreviation",
"ACCOUNT" : "Account",
"ACTION" : "Action",
"AGE" : "Age",
"AMOUNT" : "Amount",
"ASSET" : "Asser",
"BALANCE_SECTION" : "Balance Sheet Section",
Expand All @@ -702,14 +712,19 @@
"COUNTRY" : "Country",
"CURRENCY" : "Currency",
"DATE" : "Date",
"DATE_REGISTERED" : "Date Registered",
"DESCRIPTION" : "Description",
"EDIT" : "Edit",
"EMAIL" : "Email",
"EMPTY" : "There are no records to display.",
"ENTERPRISE_ID" : "ID Enterprise",
"EXCHANGE_RATE" : "Exchange Rate",
"FILTERING": {
"LABEL" : "Filter"
},
"FIRST_NAME" : "First Name",
"FUNCTION" : "Function",
"GENDER" : "Gender",
"GRADE" : "Grade",
"ID" : "ID",
"INVENTORY" : "Inventory",
Expand All @@ -719,6 +734,8 @@
"IS_WAREHOUSE" : "Is Warehouse ?",
"LABEL" : "Label",
"LAST_NAME" : "Last Name",
"LAST_TRANSACTION" : "Last Transactions",
"LAST_VISIT" : "Last Visit",
"LISTS" : "Registered price list",
"LOADING" : "Fetching data from the server.",
"LOCKED" : "Locked",
Expand All @@ -728,6 +745,7 @@
"NR" : "Nr",
"NUM" : "Number",
"PASSIVE" : "Passive",
"PATIENT_ID" : "ID Patient",
"PERCENT" : "Percentage",
"PHONE" : "Telephone",
"POSITION" : "Position",
Expand All @@ -745,12 +763,6 @@
"RESULT_ACCOUNT_SCT" : "Result Account section",
"SECTOR" : "Sector",
"SERVICE" : "Service",
"TEXT" : "Text",
"TOTAL" : "Total",
"TYPE" : "Type",
"VALUE" : "Value",
"VILLAGE" : "Village",

"SORTING": {
"LABEL" : "Sort",
"NAME_ASC" : "Name [A-Z]",
Expand All @@ -759,10 +771,11 @@
"CREATED_DSC" : "Newest",
"TOTAL_ASC" : "Largest"
},

"FILTERING": {
"LABEL" : "Filter"
}
"TEXT" : "Text",
"TOTAL" : "Total",
"TYPE" : "Type",
"VALUE" : "Value",
"VILLAGE" : "Village"
}
},
"TREE": {
Expand Down Expand Up @@ -857,7 +870,7 @@
"PATIENT_RECORDS" : "Patient Records",
"PATIENT_REGISTRATION" : "Patient Registration",
"PATIENT_REGISTRATIONS" : "Patient Registrations",
"PATIENT_SEARCH" : "Patient Search",
"PATIENT_REGISTRY" : "Patients Registry",
"PATIENT_STANDING" : "Patient Standing",
"PATIENT_VISIT_STATUS" : "Patient Visits",
"PAYMENT_PERIOD" : "Payment Period Management",
Expand Down
59 changes: 57 additions & 2 deletions client/src/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
"ER_ROW_IS_REFERENCED_2" : "Vous ne pouvez pas supprimer cette donnée car il a été utilisé dans une transaction."
},
"DEBTOR_GRP": {
"BACK" : "Retour vers les groupes débiteurs",
"CREATE" : "Créer un Groupe débiteur",
"CREATE_ANOTHER" : "Créer un autre Groupe débiteur",
"CREATED" : "Groupes débiteurs enregistrés avec succès",
"EDIT" : "Editer le groupe debiteur",
"GROUPS" : "Groupes Débiteurs",
"HELP_TXT_1" : "Cette interface vous permet de visualiser, trouver, et configurer un groupe de debiteur",
Expand All @@ -112,7 +116,27 @@
"INFO" : "Information du Groupe",
"NEW" : "Ajouter un Groupe Débiteur",
"NEW_DEBTOR_GRP" : "Nouveau Groupe de Débiteur",
"TITLE" : "Gestion des Groupes des Débiteurs"
"POLICIES" : {
"TITLE" : "Les stratégies de groupe",
"SUBSIDIES" : {
"TITLE" : "Subventions",
"INFO" : "Avec cette configuration, aucun membre de ce groupe débiteur ne sera subventionné",
"LABEL" : "Ce groupe est qualifié pour les subventions"
},
"DISCOUNTS" : {
"TITLE" : "Réductions",
"INFO" : "Avec cette configuration, aucun membre de ce groupe débiteur n'aura des réductions",
"LABEL" : "Ce groupe est qualifié pour les réductions"
},
"BILLING_SERVICES" : {
"TITLE" : "Services des facturations",
"INFO" : "Avec cette configuration, tous les membres de ce groupe débiteur sera exonéré de paiement des services de facturation appliqués automatiquement",
"LABEL" : "Ce groupe est exempté du paiement des services de facturation"
}
},
"TITLE" : "Gestion des Groupes des Débiteurs",
"SUBSCRIBED" : "Débiteurs abonnés",
"UPDATED" : "Enregistrement du groupe débiteur mis à jour"
},
"DEPOT": {
"ADD_DEPOT" : "Ajouter un dépôt",
Expand Down Expand Up @@ -154,6 +178,7 @@
"TITLE" : "Gestion des entreprises"
},
"ERRORS": {
"ERR_INTERNET_DISCONNECTED" : "Vous n'êtes pas connecté à un réseau.",
"NO_EXCHANGE_RATE" : "Aucun taux de change defini",
"UNAUTHORIZED" : "Non autorisé"
},
Expand Down Expand Up @@ -271,6 +296,7 @@
"CONTACT" : "Contact",
"COST_CENTER" : "Centre de cout",
"COUNTRY" : "Pays",
"CREATED" : "Crée",
"CREDITOR_GROUP" : "Groupe Créditeur",
"CURRENCIES" : "Monnaies",
"CURRENCY" : "Monnaie",
Expand Down Expand Up @@ -329,6 +355,7 @@
"MALE" : "Homme",
"MARITAL_STATUS" : "Etat Civil",
"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.",
"MIDDLE_NAME" : "Post-nom",
"MOTHER_NAME" : "Nom de la Mère",
"NAME" : "Nom",
Expand Down Expand Up @@ -418,6 +445,7 @@
"ENTER_SECTOR" : "Entrer secteur",
"ENTER_USERNAME" : "Entrer le nom utilisateur",
"ENTER_VILLAGE" : "Entrer village",
"FILTER_NAME" : "Filtrer par Nom...",
"SEARCH_NAME" : "Chercher Par Nom",
"SEARCH_PATIENT_ID" : "Chercher ID Patient"
},
Expand Down Expand Up @@ -536,6 +564,15 @@
"TITLE" : "Titre",
"VIEW_PATIENT_RECORDS" : "Voir Tous les enregistrements"
},
"PATIENT_REGISTRY" : {
"DAY" : "jour",
"DAYS" : "jours",
"MONTH" : "mois",
"MONTHS" : "mois",
"YEAR_OLD" : "an",
"YEARS_OLD" : "ans",
"TITLE" : "Registre des patients"
},
"PERMISSIONS": {
"ADDING_USER" : "Ajout utilisateur",
"ADD_USER" : "Ajouter utilisateur",
Expand All @@ -555,6 +592,7 @@
"ITEMS" : "Items",
"NEW_PRICE_LIST" : "Nouvelle Liste des Prix",
"NO_RECORDS" : "Pas d'enregistrement",
"NONE" : "Appliquer aucune liste de prix",
"PRICE_LIST_ITEMS" : "Eléments de la liste des prix",
"TITLE" : "Liste des Prix",
"UNABLE_TO_DELETE" : "La liste de prix ne peut être supprimer - car elle peut être courament assignée à un groupe de patient / groupes débiteurs",
Expand Down Expand Up @@ -663,6 +701,7 @@
"ABBREVIATION" : "Abbreviation",
"ACCOUNT" : "Compte",
"ACTION" : "Action",
"AGE" : "Age",
"AMOUNT" : "Montant",
"ASSET" : "Actif",
"BALANCE_SECTION" : "Section du Bilan",
Expand All @@ -672,14 +711,19 @@
"COUNTRY" : "Pays",
"CURRENCY" : "Monnaie",
"DATE" : "Date",
"DATE_REGISTERED" : "Date d'enregistrement",
"DESCRIPTION" : "Description",
"EDIT" : "Editer",
"EMAIL" : "Email",
"EMPTY" : "Il n'y a pas d'enregistrements à afficher.",
"ENTERPRISE_ID" : "ID enterprise",
"EXCHANGE_RATE" : "Taux de change",
"FILTERING": {
"LABEL" : "Filtre"
},
"FIRST_NAME" : "Prenom",
"FUNCTION" : "Fonction",
"GENDER" : "Genre",
"GRADE" : "Grade",
"ID" : "ID",
"INVENTORY" : "Inventaire",
Expand All @@ -689,6 +733,8 @@
"IS_WAREHOUSE" : "Entrepôt ?",
"LABEL" : "Label",
"LAST_NAME" : "Nom",
"LAST_TRANSACTION" : "Derniers Transactions",
"LAST_VISIT" : "Derniere visite",
"LISTS" : "Liste des prix enregistrés",
"LOADING" : "Récupération des données à partir du serveur.",
"LOCKED" : "Bloquée",
Expand All @@ -698,6 +744,7 @@
"NR" : "N°",
"NUM" : "Numéro",
"PASSIVE" : "Passive",
"PATIENT_ID" : "Patient Id",
"PERCENT" : "Pourcentage",
"PHONE" : "Telephone",
"POSITION" : "Position",
Expand All @@ -715,6 +762,14 @@
"RESULT_ACCOUNT_SCT" : "Section Compte Résultat",
"SECTOR" : "Secteur",
"SERVICE" : "Service",
"SORTING": {
"LABEL" : "Tri",
"NAME_ASC" : "Nom [A-Z]",
"NAME_DSC" : "Nom [Z-A]",
"CREATED_ASC" : "Le plus ancien",
"CREATED_DSC" : "Le plus récent",
"TOTAL_ASC" : "Le plus grand"
},
"TEXT" : "Text",
"TOTAL" : "Total",
"TYPE" : "Type",
Expand Down Expand Up @@ -814,7 +869,7 @@
"PATIENT_RECORDS" : "Historique Patients",
"PATIENT_REGISTRATION" : "Enregistrement Patient",
"PATIENT_REGISTRATIONS" : "Enregistrement Patients",
"PATIENT_SEARCH" : "Recherche Patients",
"PATIENT_REGISTRY" : "Registre des patients",
"PATIENT_STANDING" : "Patients",
"PATIENT_VISIT_STATUS" : "Patient Visitations",
"PAYMENT_PERIOD" : "Gestion Périodes",
Expand Down
7 changes: 4 additions & 3 deletions client/src/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,10 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
templateUrl : 'partials/patient_invoice/patientInvoice.html'
})

.state('/patients/search/:patientID?', {
controller: 'patientRecords',
templateUrl: '/partials/patients/search/search.html'
.state('/patients/registry/', {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parfait!

url : '/patients/registry',
controller: 'PatientRegistryController as PatientRegistryCtrl',
templateUrl: '/partials/patients/registry/registry.html'
})
.state('patientGroups', {
url : '/patients/groups',
Expand Down
1 change: 1 addition & 0 deletions client/src/js/services/DateService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,5 @@ function DateService() {

return [year, month, day].join('-');
};

}
8 changes: 4 additions & 4 deletions client/src/js/services/PatientService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PatientService.$inject = [ '$http', 'util', 'SessionService' ];
* var Patients = PatientService;
*
* // returns patient details
* Patients.detail(uuid)...
* Patients.list(uuid)...
*
* // creates a patient
* Patients.create(medicalDetails, financeDetails)...
Expand All @@ -26,7 +26,7 @@ function PatientService($http, util, Session) {
var service = this;
var baseUrl = '/patients/';

service.detail = detail;
service.list = list;
service.create = create;
service.update = update;
service.groups = groups;
Expand All @@ -46,8 +46,8 @@ function PatientService($http, util, Session) {
* @param {String} uuid The patient's UUID
* @return {Object} Promise object that will return patient details
*/
function detail(uuid) {
return $http.get(baseUrl.concat(uuid))
function list(uuid) {
return $http.get(baseUrl.concat(uuid || ''))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

.then(util.unwrapHttpResponse);
}

Expand Down
Loading