Skip to content

Commit

Permalink
Merge #4150 #4154
Browse files Browse the repository at this point in the history
4150: chore(departments): remove departments r=jniles a=jniles

Removes all references to departments as they are unused and are probably covered by services anyway.  They can be reintroduced if they need to exist.

4154: fix(reports): resize unpaid invoices report r=jniles a=jniles

Make the unpaid invoices report print in landscape orientation and ensure that there is no excess whitespace around the borders.

**before**
![image](https://user-images.githubusercontent.com/896472/73656869-4df00800-4691-11ea-8a32-8d4fc08c1915.png)


**after**
![image](https://user-images.githubusercontent.com/896472/73656738-0ff2e400-4691-11ea-801c-82686c0f9646.png)


Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>
  • Loading branch information
bors[bot] and jniles committed Feb 3, 2020
3 parents 9a9761f + 45c7932 + a999cea commit de2e791
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 633 deletions.
1 change: 0 additions & 1 deletion client/src/i18n/en/form.json
Expand Up @@ -391,7 +391,6 @@
"DEFAULT_QUANTITY": "Default Quantity",
"DEBTOR_BALANCE_REMAINING": "Debtor's Remaining Balance",
"DECREASE": "Decrease",
"DEPARTMENT" : "Department",
"DEPOT": "Depot",
"DESCRIPTION": "Description",
"DESIGNATION": "Designation",
Expand Down
1 change: 0 additions & 1 deletion client/src/i18n/en/tree.json
Expand Up @@ -35,7 +35,6 @@
"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",
Expand Down
1 change: 0 additions & 1 deletion client/src/i18n/fr/form.json
Expand Up @@ -395,7 +395,6 @@
"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",
Expand Down
1 change: 0 additions & 1 deletion client/src/i18n/fr/tree.json
Expand Up @@ -35,7 +35,6 @@
"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",
"DEBTOR_GROUP":"Gestion des Groupes Débiteurs",
"DEPOTS":"Dépôts",
"DEPOTS_REGISTRY":"Registre des dépôts",
Expand Down
99 changes: 0 additions & 99 deletions client/src/modules/department/department.ctrl.js

This file was deleted.

35 changes: 0 additions & 35 deletions client/src/modules/department/department.html

This file was deleted.

9 changes: 0 additions & 9 deletions client/src/modules/department/department.routes.js

This file was deleted.

17 changes: 0 additions & 17 deletions client/src/modules/department/department.service.js

This file was deleted.

34 changes: 0 additions & 34 deletions client/src/modules/department/modals/createUpdate.html

This file was deleted.

50 changes: 0 additions & 50 deletions client/src/modules/department/modals/createUpdate.js

This file was deleted.

25 changes: 0 additions & 25 deletions client/src/modules/department/templates/action.tmpl.html

This file was deleted.

8 changes: 0 additions & 8 deletions server/config/routes.js
Expand Up @@ -106,7 +106,6 @@ const transactions = require('../controllers/finance/transactions');
// looking up an entity by it reference
const referenceLookup = require('../lib/referenceLookup');

const department = require('../controllers/admin/department');
const tags = require('../controllers/admin/tags');

const ward = require('../controllers/medical/ward/ward');
Expand Down Expand Up @@ -866,13 +865,6 @@ exports.configure = function configure(app) {
app.post('/roles/assignTouser', rolesCtrl.assignRolesToUser);
app.post('/roles/actions', rolesCtrl.assignActionToRole);

// department
app.get('/departments', department.read);
app.get('/departments/:uuid', department.detail);
app.post('/departments', department.create);
app.delete('/departments/:uuid', department.delete);
app.put('/departments/:uuid', department.update);

// entities types API
app.get('/entities/types', entities.types.list);
app.get('/entities/types/:id', entities.types.details);
Expand Down

0 comments on commit de2e791

Please sign in to comment.