Index: docker-compose.yml =================================================================== diff -u -N -r1006d73b16cca8efe7bcc43ca395549c4fb7f433 -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- docker-compose.yml (.../docker-compose.yml) (revision 1006d73b16cca8efe7bcc43ca395549c4fb7f433) +++ docker-compose.yml (.../docker-compose.yml) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -21,7 +21,7 @@ - ui-layout auth-ui: - image: openlmis/auth-ui:6.2.1 + image: openlmis/auth-ui:6.2.3 volumes: - '/openlmis-auth-ui' @@ -31,12 +31,12 @@ - '/openlmis-referencedata-ui' ui-components: - image: openlmis/ui-components:7.2.0 + image: openlmis/ui-components:7.2.3-SNAPSHOT volumes: - '/openlmis-ui-components' ui-layout: - image: openlmis/ui-layout:5.1.4 + image: openlmis/ui-layout:5.1.6 volumes: - '/openlmis-ui-layout' Index: src/pcmt-execution/pcmt-execution.js =================================================================== diff -u -N -r838700b067994d6bc2bbbb1b810faf7f9e60c2bd -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- src/pcmt-execution/pcmt-execution.js (.../pcmt-execution.js) (revision 838700b067994d6bc2bbbb1b810faf7f9e60c2bd) +++ src/pcmt-execution/pcmt-execution.js (.../pcmt-execution.js) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -44,17 +44,11 @@ * @return {Object} the execution object */ function Execution(json) { - this.id = json.id; this.manualExecution = json.manualExecution; - this.programId = json.programId; - this.facilityId = json.facilityId; this.processingPeriodId = json.processingPeriodId; - this.description = json.description; - this.targetUrl = json.targetUrl; this.startDate = json.startDate; this.endDate = json.endDate; this.response = json.response; - this.userId = json.userId; } } })(); Index: src/pcmt-integration/pcmt-integration.resource.js =================================================================== diff -u -N -r838700b067994d6bc2bbbb1b810faf7f9e60c2bd -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- src/pcmt-integration/pcmt-integration.resource.js (.../pcmt-integration.resource.js) (revision 838700b067994d6bc2bbbb1b810faf7f9e60c2bd) +++ src/pcmt-integration/pcmt-integration.resource.js (.../pcmt-integration.resource.js) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -39,7 +39,7 @@ return IntegrationResource; function IntegrationResource() { - this.super('/api/integrationProgramSchedules', { + this.super('/api/integrationSchedules', { paginated: true }); } Index: src/pcmt-integration/pcmt-integration.resource.spec.js =================================================================== diff -u -N -r838700b067994d6bc2bbbb1b810faf7f9e60c2bd -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- src/pcmt-integration/pcmt-integration.resource.spec.js (.../pcmt-integration.resource.spec.js) (revision 838700b067994d6bc2bbbb1b810faf7f9e60c2bd) +++ src/pcmt-integration/pcmt-integration.resource.spec.js (.../pcmt-integration.resource.spec.js) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -33,7 +33,7 @@ it('should extend OpenlmisResource', function() { new this.IntegrationResource(); - expect(this.OpenlmisResourceMock).toHaveBeenCalledWith('/api/integrationProgramSchedules', { + expect(this.OpenlmisResourceMock).toHaveBeenCalledWith('/api/integrationSchedules', { paginated: true }); }); Index: src/pcmt/messages_en.json =================================================================== diff -u -N -r838700b067994d6bc2bbbb1b810faf7f9e60c2bd -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- src/pcmt/messages_en.json (.../messages_en.json) (revision 838700b067994d6bc2bbbb1b810faf7f9e60c2bd) +++ src/pcmt/messages_en.json (.../messages_en.json) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -2,5 +2,6 @@ "pcmt.serviceName": "PCMT Integration", "pcmt.executions": "Logs", "pcmt.integrations": "Schedule Integration", - "pcmt.configurations": "Configuration" + "pcmt.configurations": "Configuration", + "adminRoleForm.pcmtManagement": "Manage PCMT integrations" } Index: src/pcmt/pcmt.routes.js =================================================================== diff -u -N -r838700b067994d6bc2bbbb1b810faf7f9e60c2bd -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- src/pcmt/pcmt.routes.js (.../pcmt.routes.js) (revision 838700b067994d6bc2bbbb1b810faf7f9e60c2bd) +++ src/pcmt/pcmt.routes.js (.../pcmt.routes.js) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -21,13 +21,11 @@ routes.$inject = ['$stateProvider', 'ADMINISTRATION_RIGHTS']; - function routes($stateProvider, ADMINISTRATION_RIGHTS) { - + function routes($stateProvider) { $stateProvider.state('openlmis.administration.pcmt', { label: 'pcmt.serviceName', showInNavigation: true, url: '/pcmt', - accessRights: [ADMINISTRATION_RIGHTS.PCMT_MANAGEMENT], controller: 'PcmtController', templateUrl: 'pcmt/pcmt.html', controllerAs: 'vm' Index: yarn.lock =================================================================== diff -u -N -rf48f7fa6ae717605437eef882ac08861d676a704 -rfeb7dc66c8ceeee5eb41842c14eb933d5dd92aa2 --- yarn.lock (.../yarn.lock) (revision f48f7fa6ae717605437eef882ac08861d676a704) +++ yarn.lock (.../yarn.lock) (revision feb7dc66c8ceeee5eb41842c14eb933d5dd92aa2) @@ -122,9 +122,9 @@ version "0.7.19" resolved "https://codeload.github.com/HubSpot/offline/tar.gz/a17291864212aab9ae9325c7ce5a2e0f541e96bf" -"@bower_components/perfect-scrollbar@noraesae/perfect-scrollbar-bower#^0.8.1": - version "0.0.0" - resolved "https://codeload.github.com/noraesae/perfect-scrollbar-bower/tar.gz/b0a26373855b3d31ce5bd9904e2ba4d9a24ebf52" +"@bower_components/perfect-scrollbar@noraesae/perfect-scrollbar-bower#^0.6.12": + version "0.5.9" + resolved "https://codeload.github.com/noraesae/perfect-scrollbar-bower/tar.gz/5f29dfcd6162b802a6a9407c4530d8797b59684d" "@bower_components/pouchdb@pouchdb/pouchdb#^6.3.4": version "6.4.3"