Skip to content

Commit

Permalink
Merge #7216
Browse files Browse the repository at this point in the history
7216: fix(odk): clean up all remaining ODK references r=jmcameron a=jniles

This commit finishes the work done in #7199, by removing all additional references, dependencies, documentation, and translation related to the ODK plugin.  This includes:

 1. The ODK i18n files.
 2. The English ODK plugin documentation.
 3. The legacy ODK Settings service.
 4. The QR Code links and dependencies.

The work on the ODK connection has now been completely reversed.

Closes #7214.

Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>
  • Loading branch information
bors[bot] and jniles authored Aug 23, 2023
2 parents 2c5f84d + 036e0d3 commit 1a9767b
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 183 deletions.
3 changes: 3 additions & 0 deletions .sqlfluff
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[sqlfluff]
large_file_skip_byte_limit = 180000
indent_unit = space
26 changes: 0 additions & 26 deletions client/src/i18n/en/odk.json

This file was deleted.

1 change: 0 additions & 1 deletion client/src/i18n/en/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@
"STOCK_REPORT" : "Stock Inventories",
"STOCK_REQUISITION":"Requisition",
"STOCK_SETTINGS": "Stock Settings",
"ODK_SETTINGS" : "ODK Settings",
"STOCK" : "Stock",
"STOCK_VALUE" : "Stock Value Report",
"SUBSIDY" : "Subsidy Management",
Expand Down
26 changes: 0 additions & 26 deletions client/src/i18n/fr/odk.json

This file was deleted.

1 change: 0 additions & 1 deletion client/src/i18n/fr/tree.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@
"STOCK_REQUISITION":"Réquisition",
"STOCK_MOVEMENT_REPORT": "Rapport graphique des mouvements",
"STOCK_SETTINGS": "Paramètres de stock",
"ODK_SETTINGS" : "Paramètres de l'ODK",
"SUBSIDY":"Gestion des subventions",
"TAGS" : "Gestion des étiquettes",
"TRANSACTION_TYPE":"Types de Transaction",
Expand Down
57 changes: 0 additions & 57 deletions client/src/modules/odk-settings/odk-settings.service.js

This file was deleted.

9 changes: 0 additions & 9 deletions client/src/modules/users/qrcode.modal.html

This file was deleted.

14 changes: 0 additions & 14 deletions client/src/modules/users/qrcode.modal.js

This file was deleted.

6 changes: 0 additions & 6 deletions client/src/modules/users/templates/grid/action.cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
</a>
</li>
<li class="divider"></li>
<li>
<a data-method="qrcode" ng-click="grid.appScope.showQRCode(row.entity.id)" href>
<i class="fa fa-qrcode"></i> <span translate>ODK.QRCODE</span>
</a>
</li>
<li class="divider"></li>

<li ng-if="!row.entity.deactivated">
<a data-method="deactivate" ng-click="grid.appScope.activatePermissions(row.entity, 1, 'FORM.DIALOGS.CONFIRM_DEACTIVATION')" href>
Expand Down
17 changes: 1 addition & 16 deletions client/src/modules/users/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ angular.module('bhima.controllers')

UsersController.$inject = [
'$state', '$uibModal', 'UserService', 'NotifyService', 'ModalService', 'uiGridConstants',
'ODKSettingsService',
];

/**
* Users Controller
* This module is responsible for handling the CRUD operation on the user
*/
function UsersController($state, $uibModal, Users, Notify, Modal, uiGridConstants, ODKSettings) {
function UsersController($state, $uibModal, Users, Notify, Modal, uiGridConstants) {
const vm = this;
vm.gridApi = {};
vm.toggleFilter = toggleFilter;
vm.editRoles = editRoles;
vm.showQRCode = showQRCode;

// this function selectively applies the muted cell classes to
// disabled user entities
Expand Down Expand Up @@ -171,18 +169,5 @@ function UsersController($state, $uibModal, Users, Notify, Modal, uiGridConstant
vm.loading = !vm.loading;
}

function showQRCode(userId) {
ODKSettings.getAppUserQRCode(userId)
.then(qrcode => {
return $uibModal.open({
templateUrl : 'modules/users/qrcode.modal.html',
controller : 'UserQRCodeController as UserQRCtrl',
resolve : { data : () => qrcode },
}).result;
})
.then(() => load(Users.filters.formatHTTP(true)))
.catch(Notify.handleError);
}

startup();
}
23 changes: 0 additions & 23 deletions docs/en/plugins/odk-central.md

This file was deleted.

1 change: 0 additions & 1 deletion gulpfile.js/client-vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const {

let VENDOR_FILES = [
'node_modules/jquery/dist/jquery.min.js', // jquery
'node_modules/cropper/dist/cropper.min.js', // TODO(@jniles) - do we need this?

// Angular
'node_modules/angular/angular.min.js',
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
"chartjs-plugin-datalabels": "^2.1.0",
"connect-redis": "^7.1.0",
"cron": "^2.4.1",
"cropper": "^4.0.0",
"cross-env": "^7.0.3",
"csvtojson": "^2.0.8",
"debug": "^4.3.4",
Expand Down Expand Up @@ -137,9 +136,7 @@
"ngstorage": "^0.3.11",
"nodemailer": "^6.9.4",
"p-retry": "^4.6.1",
"pako": "^2.0.4",
"q": "^1.5.1",
"qrcode": "^1.5.3",
"stream-to-promise": "^3.0.0",
"tempy": "^1.0.1",
"typeface-open-sans": "^1.1.13",
Expand Down

0 comments on commit 1a9767b

Please sign in to comment.