diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..c4b1a684d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/www +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 1bcdb73bc..072acbca0 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,31 +1,31 @@ -image: node:14.15.0 - +definitions: + services: + docker: + memory: 3072 pipelines: branches: - '{master,test}': - # - step: - # caches: - # - node - # script: - # - apt-get update; apt-get install -y gettext-base; - # - echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list - # - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - # - set -x && apt-get update && apt-get install -y xvfb google-chrome-stable - # - wget -q -O /usr/bin/xvfb-chrome https://bitbucket.org/atlassian/docker-node-chrome-firefox/raw/ff180e2f16ea8639d4ca4a3abb0017ee23c2836c/scripts/xvfb-chrome - # - ln -sf /usr/bin/xvfb-chrome /usr/bin/google-chrome - # - chmod 755 /usr/bin/google-chrome - # - npm ci - # - npm install - # - ./node_modules/@angular/cli/bin/ng -v - # - npm run test + developer: + - step: + size: 2x + name: 'Build Images and push to Docker hub' + caches: + - docker + script: + - export BITBUCKET_COMMIT_SHORT=$(echo $BITBUCKET_COMMIT| cut -c1-7) + - export IMAGE_NAME=gabinetedigital/gdsite:$BITBUCKET_COMMIT_SHORT + - docker build -t $IMAGE_NAME . + - docker login --username $DOCKER_USER --password $DOCKER_PASS + - docker push $IMAGE_NAME + - step: + name: 'Deploy on server' + script: + - echo "Starting deploy..." + - export BITBUCKET_COMMIT_SHORT=$(echo $BITBUCKET_COMMIT| cut -c1-7) + - pipe: atlassian/ssh-run:0.4.0 + variables: + SSH_USER: 'administrator' + SERVER: '41.63.166.54' + COMMAND: 'export GDSITE_VERSION=${BITBUCKET_COMMIT_SHORT};cd ${COMPOSE_FOLDER} ; docker-compose up -d gdsite' - - step: - caches: - - node - script: - - apt-get update; - - npm ci - - npm install - - ./node_modules/@angular/cli/bin/ng -v - - npm run build --prod - \ No newline at end of file +options: + docker: true diff --git a/dockerfile b/dockerfile index fbee3b3f6..2fadfdb98 100644 --- a/dockerfile +++ b/dockerfile @@ -1,68 +1,13 @@ -# # Stage 1: Compile and Build angular codebase - - - -# # Use official node image as the base image - -FROM node:14.15.0 as build - -# # Set up ENV - -ENV NODE_ENV=production - -# Set the working directory - -WORKDIR /usr/local/app - - - - - - -# # Install all the dependencies - +FROM node:14 as build +WORKDIR /app +COPY ./package*.json /app/ RUN npm config set unsafe-perm true - -RUN npm ci - -RUN npm audit fix - -RUN npm install -g @ionic/cli - -RUN npm install -g @angular/cli - -RUN npm install -g cordova - -RUN npm install -g cordova-res - -# # # Generate the build of the application - +RUN npm install -g ionic +RUN npm config set legacy-peer-deps true +RUN npm install --save --legacy-peer-deps +COPY ./ /app/ RUN ionic build --prod -# # Add the source code to app - -COPY ./www /usr/local/app/ - - - -# # Stage 2: Serve app with nginx server - - - -# # Use official nginx image as the base image - -# FROM nginx:latest - - - -# Copy the build output to replace the default nginx contents. - -#COPY ./www/ /usr/share/nginx/html/ - - - -# Expose port 80 - -# EXPOSE 80 - -#CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +FROM nginx:alpine +RUN rm -rf /usr/share/nginx/html/* +COPY --from=build /app/www/ /usr/share/nginx/html/ \ No newline at end of file diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index af37382ce..5627b6021 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -51,20 +51,6 @@ export class DespachoService { return this.processes.CompleteTask(body) } - // reencaminhar(note:string, documents:any, serialnumber) { - - // let body = { - // "serialNumber": serialnumber, - // "action": "Reencaminhar", - // "ActionTypeId": 98, - // "dataFields": { - // "ReviewUserComment": note, - // }, - // "AttachmentList" :documents, - // } - // return this.processes.CompleteTask(body) - // } - executado(note:string, documents:any , serialnumber) { let body = { @@ -139,7 +125,7 @@ export class DespachoService { "dataFields": { "ReviewUserComment": note, }, - "AttachmentList" :documents, + "AttachmentList" :documents, } } diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts index 848b5d728..c49a32a2b 100644 --- a/src/app/Rules/pedido.service.ts +++ b/src/app/Rules/pedido.service.ts @@ -29,13 +29,13 @@ export class PedidoService { return this.processes.postDeferimento(body) } - taskCompleteParecer({serialNumber}) { + taskCompleteParecer({serialNumber, note}) { const body = { "serialNumber": serialNumber, "action": "Parecer", "ActionTypeId": 92, // Pedido de parece "dataFields": { - "ReviewUserComment": '', + "ReviewUserComment": note, }, "AttachmentList" :null, } diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 382227f41..2b306ddbf 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -8,6 +8,8 @@ + {{ postData.DispatchFolder.Subject }} +
@@ -19,6 +21,8 @@
+ {{ postData.DispatchFolder.Message }} +
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 2c1724805..d4c4828ad 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -257,6 +257,11 @@ export class CreateProcessPage implements OnInit { }); + let docs = { + ProcessInstanceID: "", + Attachments: [] + } + const DocumentToSave = this.documents.map((e) => { return { ApplicationId: e.ApplicationType, @@ -264,6 +269,8 @@ export class CreateProcessPage implements OnInit { } }); + docs.Attachments = DocumentToSave; + this.dispatchFolder.SubjectTypes = this.selectedTypes; const loader = this.toastService.loading() @@ -278,6 +285,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } try { @@ -302,6 +310,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } try { @@ -309,8 +318,9 @@ export class CreateProcessPage implements OnInit { await this.despachoService.createParecer(this.postData).toPromise(); await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); } else { + await this.pedidoService.createParecer(this.postData).toPromise(); - await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise(); + await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise(); } this.modalController.dismiss(); @@ -331,6 +341,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } try { @@ -358,6 +369,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } if(this.postData.DispatchFolder.Message){ @@ -387,6 +399,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } try { @@ -396,7 +409,7 @@ export class CreateProcessPage implements OnInit { await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); } else { await this.pedidoService.createParecer(this.postData).toPromise(); - await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise(); + await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber, note: this.postData.DispatchFolder.Subject}).toPromise(); } this.modalController.dismiss(); @@ -417,6 +430,7 @@ export class CreateProcessPage implements OnInit { UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, + AttachmentList: docs } try { @@ -474,7 +488,7 @@ export class CreateProcessPage implements OnInit { } } else { - console.log('unexpected error') + // console.log('unexpected error') } diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index fa85b54f5..86e045240 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -447,6 +447,7 @@ (clearContact)="clearContact()" (openAttendeesComponent)="openAttendeesComponent($event)" (closeComponent)="approveEventDismissGoBack()" + (approveEventDismiss) = "approveEventDismiss($event)" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index ccdf3a347..ce896439f 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -5,11 +5,12 @@
+
- - + +
- - + +
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 3549686fe..6d54d86ef 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -16,6 +16,7 @@ import { RouteService } from 'src/app/services/route.service'; export class EventActionsPopoverPage implements OnInit { serialNumber:string; instanceId: string; + activityInstanceName: string constructor( private navParams: NavParams, @@ -27,7 +28,8 @@ export class EventActionsPopoverPage implements OnInit { public ThemeService: ThemeService) { this.serialNumber = this.navParams.get('serialNumber'); this.instanceId = this.navParams.get('InstanceId'); - } + this.activityInstanceName = this.navParams.get('InstanceId'); + } ngOnInit() { window.onresize = (event) => { @@ -67,6 +69,26 @@ export class EventActionsPopoverPage implements OnInit { } + async ReenviarTask() { + let body = { "serialNumber": this.serialNumber, "action": "Reenviar" } + + + const loader = this.toastService.loading() + try { + await this.processes.PostTaskAction(body).toPromise() + + this.toastService.successMessage(); + this.goBack(); + } catch (error) { + + this.toastService.badRequest() + } + finally { + loader.remove() + } + + } + async emendarTask() { this.closePopover(); @@ -107,25 +129,24 @@ export class EventActionsPopoverPage implements OnInit { } } else{ - //this.alertService.presentAlert('Operação cancelada!'); + } }); } - async rejeitar(){ + async rejeitar() { let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } - - const loader = this.toastService.loading() + const loader = this.toastService.loading(); try { await this.processes.PostTaskAction(body).toPromise(); await this.toastService.successMessage('Processo rejeitado'); this.goBack(); } catch (error) { - this.toastService.badRequest() + this.toastService.badRequest(); } finally { - loader.remove() + loader.remove(); } @@ -148,6 +169,6 @@ export class EventActionsPopoverPage implements OnInit { modal.onDidDismiss().then(res => { }); - } + } } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 0ded75400..36493bc87 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -98,7 +98,6 @@ export class NewEventPage implements OnInit { this.postEvent.EventRecurrence = {Type:'-1'}; this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; - /* this.profile = this.navParams.get('profile'); */ this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 0b8d7066c..2a05fb7e1 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -270,9 +270,6 @@ export class DespachoPage implements OnInit { async viewDocument(docId: string, Document) { - - - const modal = await this.modalController.create({ component: ViewDocumentPage, componentProps: { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 5c3e3e366..6c06b62b5 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -152,6 +152,9 @@ export class ApproveEventModalPage implements OnInit { async openOptions(ev:any) { const popover = await this.popoverController.create({ component: EventActionsPopoverPage, + componentProps: { + activityInstanceName: this.loadedEvent.activityInstanceName + }, cssClass: 'event-actions-popover', event: ev, translucent: true diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 97645ea2e..c5289e683 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -101,13 +101,14 @@
+ {{ loadedEvent.activityInstanceName }}
- - + +
- - + +
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index fdcb86bba..b4061d4ec 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -187,11 +187,9 @@ export class ApproveEventPage implements OnInit { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - - let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId; + this.loadedAttachments = this.loadedEvent.Documents; - - + }) }) } @@ -205,7 +203,6 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise(); this.addProcessToDB(this.loadedEvent) - this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); @@ -346,6 +343,7 @@ export class ApproveEventPage implements OnInit { componentProps: { serialNumber: ev.serialNumber, InstanceId: ev.workflowInstanceDataFields.InstanceId, + activityInstanceName: this.loadedEvent.activityInstanceName }, }); return await popover.present(); diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 63d07d0d0..4d1b2d5c0 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -52,6 +52,9 @@

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
@@ -74,6 +77,9 @@

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 80d8b217d..11d6545ef 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -123,3 +123,13 @@ ion-item-sliding{ color: #000 !important; border: 1px solid red !important; } + + +.label-event-type { + padding: 1px 7px; + display: inline-block; + background: #f05d5e; + border-radius: 17px; + color: white; + font-size: 10pt; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 3dac7e75a..7d110b04a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -158,14 +158,14 @@ export class EventListPage implements OnInit { this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) { - return item.activityInstanceName != 'Editar Evento' - }) + // this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) { + // return item.activityInstanceName != 'Editar Evento' + // }) this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { }) - //this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse()); + } else if (this.segment == 'PR') { let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); @@ -173,14 +173,14 @@ export class EventListPage implements OnInit { this.eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - this.eventsPRList = (this.eventsPRList || []).filter(function(item) { - return item.activityInstanceName != 'Editar Evento' - }) + // this.eventsPRList = (this.eventsPRList || []).filter(function(item) { + // return item.activityInstanceName != 'Editar Evento' + // }) this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { }) - //this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse()); + } this.showLoader = false; this.skeletonLoader = false diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index ea58f3b8a..13a112e83 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -8,7 +8,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index c3a0ffca6..1609edf62 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -209,15 +209,6 @@ export class ExpedientTaskModalPage implements OnInit { Priority: new FormControl(this.postData.Priority, [ Validators.required, ]), - // CalendarName: new FormControl(this.postEvent.CalendarName, [ - // Validators.required - // ]), - // Categories: new FormControl(this.postEvent.Categories, [ - // Validators.required - // ]), - // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ - // Validators.required - // ]), participantes: new FormControl(this.taskParticipants, [ Validators.required ]), @@ -298,195 +289,6 @@ export class ExpedientTaskModalPage implements OnInit { this.dispatchFolder.SubjectTypes = this.selectedTypes; const loader = this.toastService.loading() - // switch (this.loggeduser.Profile) { - // case 'MDGPR': - // if(this.taskParticipants.length > 0) { - // switch (this.taskType) { - // case '0': // Despacho - // this.postData = { - // DistributionType: "Paralelo", - // CountryCode: 'AO', - // Priority: this.postData.Priority, - // UserEmail: this.loggeduser.Email, - // UsersSelected: attendees, - // DispatchFolder: this.dispatchFolder, - // AttachmentList: docs, - // } - - // let action_despacho = { - // "serialNumber": this.task.serialNumber, - // "action": "Tratado", - // "ActionTypeId": 94, - // "dataFields": { - // "Note": "", - // } - // } - - - - // try { - - // this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); - // await this.toastService._successMessage('Processo efetuado'); - // this.modalController.dismiss(action_despacho); - - // } catch (error) { - // await this.toastService._badRequest('Processo não efetuado') - // } finally { - // loader.remove() - // } - - - // break; - - // case '1': // Parecer - // this.postData = { - // DistributionType: "Paralelo", - // CountryCode: 'AO', - // Priority: this.postData.Priority, - // UserEmail: this.loggeduser.Email, - // UsersSelected: attendees, - // DispatchFolder: this.dispatchFolder, - // AttachmentList: docs - // } - - // let action_parecer = { - // "serialNumber": this.task.serialNumber, - // "action": "Tratado", - // "ActionTypeId": 92, - // "dataFields": { - // "Note": "", - // } - // } - - // try { - // this.taskResult = await this.processes.postParecer(this.postData).toPromise(); - // await this.toastService._successMessage('Pedido enviado'); - // this.modalController.dismiss(action_parecer); - - // } catch (error) { - // await this.toastService._badRequest('Processo não efetuado') - // } finally { - // loader.remove() - // } - // break; - // case '2': // Deferimento - // this.postData = { - // DistributionType: "Paralelo", - // CountryCode: 'AO', - // Priority: this.postData.Priority, - // UserEmail: this.loggeduser.Email, - // UsersSelected: attendees, - // DispatchFolder: this.dispatchFolder, - // AttachmentList: docs - // } - // // - // let action_deferimento = { - // "serialNumber": this.task.serialNumber, - // "action": "Tratado", - // "ActionTypeId": 93, - // "dataFields": { - // "Note": "", - // } - // } - - // try { - - // this.taskResult = await this.processes.postDeferimento(this.postData).toPromise(); - // this.toastService._successMessage('Processo efetuado'); - // this.modalController.dismiss(action_deferimento); - // } catch (error) { - // await this.toastService._badRequest('Processo não efetuado') - // } finally { - // loader.remove() - // } - - - // break; - // } - // } - // else { - // this.alertController.presentAlert("Lista de i-ntervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); - // } - // break; - // case 'PR': - // switch (this.taskType) { - // case '0': // despacho - // this.postData = { - // DistributionType: "Paralelo", - // CountryCode: 'AO', - // Priority: this.postData.Priority, - // UserEmail: this.loggeduser.Email, - // UsersSelected: attendees, - // DispatchFolder: this.dispatchFolder, - // AttachmentList: docs, - // } - - - // let action_despacho_pr = { - // "serialNumber": this.task.serialNumber, - // "action": "Tratado", - // "ActionTypeId": 99999881 , - // "dataFields": { - // "Note": "", - // } - // } - - // if(this.postData.DispatchFolder.Message){ - // try { - // this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise(); - // await this.toastService._successMessage('Processo efetuado'); - // this.modalController.dismiss(action_despacho_pr); - // } catch (error) { - - // await this.toastService._badRequest('Processo não efetuado') - // } finally { - // //loader.remove() - // } - // } - // else{ - // this.validateField = true; - // this.toastService._badRequest('Por favor adicione uma descrição'); - // } - // loader.remove(); - // break; - - // case '1': // parecer - // this.postData = { - // DistributionType: "Paralelo", - // CountryCode: 'AO', - // Priority: this.postData.Priority, - // UserEmail: this.loggeduser.Email, - // UsersSelected: attendees, - // DispatchFolder: this.dispatchFolder, - // AttachmentList: docs - // } - - // let action_parecer_pr = { - // "serialNumber": this.task.serialNumber, - // "action": "Tratado", - // "ActionTypeId": 99999881, - // "dataFields": { - // "Note": "", - // } - // } - - // try { - // this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - // await this.toastService._successMessage('Pedido enviado'); - // this.modalController.dismiss(action_parecer_pr); - // } catch (error) { - - // await this.toastService._badRequest('Processo não efetuado') - // } finally { - // loader.remove() - // } - - // break; - // } - // break; - // } - if(this.loggeduser.Profile != 'PR') { if(this.taskParticipants.length > 0) { switch (this.taskType) { @@ -506,12 +308,10 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 94, "dataFields": { - "Note": "", + "Note": this.postData.DispatchFolder.Subject, } } - - try { this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); @@ -543,7 +343,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 92, "dataFields": { - "Note": "", + "Note": this.postData.DispatchFolder.Subject, } } @@ -570,11 +370,11 @@ export class ExpedientTaskModalPage implements OnInit { } // let action_deferimento = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": "", + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 93, + "dataFields": { + "Note": this.postData.DispatchFolder.Subject, } } @@ -612,7 +412,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 99999881 , "dataFields": { - "Note": "", + "Note": this.postData.DispatchFolder.Subject, } } @@ -651,7 +451,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 99999881, "dataFields": { - "Note": "", + "Note": this.postData.DispatchFolder.Subject, } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 5b37105c1..3c977a90f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -32,6 +32,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { DataService } from 'src/app/services/data.service'; import { Storage } from '@ionic/storage'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; @Component({ selector: 'app-gabinete-digital', @@ -113,7 +114,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { // // pipe - + expedienteTaskPipe = new ExpedienteTaskPipe(); + loadCount = false customTaskPipe = new CustomTaskPipe() @@ -161,12 +163,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } ngDoCheck(): void { - /* if( window.innerWidth < 701) { - this.segmentVista = "listview"; - } - else{ - this.segmentVista = "boxview"; - } */ + } closeAllDesktopComponent() { @@ -344,13 +341,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { const totalHours = Math.floor(totalMinutes / 60); const totalDays = Math.floor(totalHours / 24); - //const hours = totalHours - (totalDays * 24); - //const minutes = totalMinutes - (totalDays * 24 * 60) - (hours * 60); - // const seconds = totalSeconds - (totalDays * 24 * 60 * 60) - (hours * 60 * 60) - (minutes * 60); - - // let diffDays = totalDays; - // let diffMinutes = minutes; - if (totalDays == 0) { if (allday) { customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)"; @@ -358,7 +348,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { return customDate; } else { - //customDate = this.getCustomDate(start)+","+this.getCustomHours(start)+" ("+minutes+" mins)"; customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " | " + this.getCustomHours(end); return customDate; } @@ -562,7 +551,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { let allProcessesList = allPreocesses_; - console.log(allProcessesList) allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma') allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma') @@ -615,10 +603,16 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.allProcessesList = removeDuplicate(this.allProcessesList); this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate') - let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); + let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") + + expedientes = expedientes.filter((item) => { + return item.activityInstanceName != 'Retificar Expediente' + }); + + expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); - this.expedientegbstore.count = expedientes.length + this.expedientegbstore.count = expedientes.length; this.expedientegbstore.reset(expedientes); diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 792d1d6a0..e3f5efea6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -1,20 +1,5 @@ - - -
@@ -121,30 +106,29 @@
-
-
- +
- - - + + +
- - + +
-
- - + + + +
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 826a393c6..84340d863 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -40,9 +40,9 @@ export class ApproveEventPage implements OnInit { @Output() EditApproveEventDismiss = new EventEmitter(); constructor( - private router:Router, + private router: Router, private modalController: ModalController, - private processes:ProcessesService, + private processes: ProcessesService, private attachmentsService: AttachmentsService, private popoverController: PopoverController, private toastService: ToastService, @@ -61,24 +61,8 @@ export class ApproveEventPage implements OnInit { this.getAttachments(); } - /* ngOnChanges() { - this.getTask(); - this.getAttachments(); - - setTimeout(()=>{ - this.getTask(); - this.getAttachments(); - }, 6000) - - setTimeout(()=>{ - this.getTask(); - this.getAttachments(); - }, 10000) - - } */ close() { - /* this.router.navigate(['/home/gabinete-digital/event-list']); */ this.closeEventToApprove.emit(); this.modalController.dismiss(); } @@ -105,20 +89,11 @@ export class ApproveEventPage implements OnInit { this.toastService.successMessage() } catch (error) { this.toastService.badRequest() - } finally { + } finally { this.close() loader.remove() } - /* this.approveEventDismiss.emit({ - "serialNumber": serialNumber, - "action": "Aprovar", - "saveData": { - loadedEvent: this.loadedEvent, - today: this.today, - customDate: this.customDate - } - }); */ } async rejectTask(serialNumber:string) { @@ -171,6 +146,9 @@ export class ApproveEventPage implements OnInit { async openOptions(ev:any) { const popover = await this.popoverController.create({ component: EventActionsPopoverPage, + componentProps: { + activityInstanceName: this.loadedEvent.activityInstanceName + }, cssClass: 'event-actions-popover', event: ev, translucent: true @@ -180,7 +158,6 @@ export class ApproveEventPage implements OnInit { async emendTask(serialNumber:string) { - const modal = await this.modalController.create({ component: EmendMessageModalPage, componentProps:{ @@ -195,7 +172,7 @@ export class ApproveEventPage implements OnInit { .then( async (res) => { - if(res.data !== ''){ + if(res.data !== '') { let body = { "serialNumber": serialNumber, "action": "Emendar", "dataFields": { @@ -203,7 +180,7 @@ export class ApproveEventPage implements OnInit { } } - const loader = this.toastService.loading() + const loader = this.toastService.loading(); try { await this.processes.PostTaskAction(body).toPromise(); @@ -216,12 +193,10 @@ export class ApproveEventPage implements OnInit { } } else{ - //this.alertService.presentAlert('Operação cancelada!'); + } }); - //this.openEmendMessageModal(serialNumber); - //this.goBack(); } goToEventsToApprove() { diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 4dd30336a..9aba6682d 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -1,6 +1,7 @@
+
@@ -8,7 +9,7 @@
- Editar evento por aprovar + Editar evento por aprovar
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 75dc8687e..7fa166360 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -14,6 +14,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker' import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; import { ThemeService } from 'src/app/services/theme.service' +import { Router } from '@angular/router'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -115,6 +116,7 @@ export class EditEventToApprovePage implements OnInit { @Output() setIntervenientCC = new EventEmitter(); @Output() closeComponent = new EventEmitter(); @Output() closeEventToApprove = new EventEmitter(); + @Output() approveEventDismiss = new EventEmitter(); @Input() saveData: any; @Input() serialNumber: string @@ -128,7 +130,8 @@ export class EditEventToApprovePage implements OnInit { private attachmentsService: AttachmentsService, private processes:ProcessesService, private toastService: ToastService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private router: Router, ) { this.isEventEdited = false; } @@ -175,12 +178,12 @@ export class EditEventToApprovePage implements OnInit { }); } - onSelectedRecurringChanged(ev:any){ - if(ev.length > 1){ + onSelectedRecurringChanged(ev:any) { + if(ev.length > 1) { this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1'); } - if(ev.length == 0){ + if(ev.length == 0) { this.eventProcess.workflowInstanceDataFields.OccurrenceType = "-1"; } } @@ -213,17 +216,21 @@ export class EditEventToApprovePage implements OnInit { close() { - window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {} - - // this.closeComponent.emit(); + window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}; this.closeEventToApprove.emit(); - this.setIntervenient.emit([]); this.setIntervenientCC.emit([]); this.clearContact.emit(); - //this.deleteTemporaryData(); + + this.approveEventDismiss.emit({ + "serialNumber": this.eventProcess.serialNumber, + "action": "Aprovar", + "saveData": this.eventProcess + }); + + } diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 9d6365ab4..1b5f13f11 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -29,7 +29,6 @@
-
{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
@@ -66,6 +68,9 @@

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

+
+
{{ event.activityInstanceName }}
+
diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss index effffe6ac..72b9e85f6 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -103,3 +103,13 @@ padding: 0; } } + + +.label-event-type { + padding: 1px 7px; + display: inline-block; + background: #f05d5e; + border-radius: 17px; + color: white; + font-size: 10pt; +} \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 2d5ff87a9..dd9b3b6f0 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -73,7 +73,7 @@ export class EventListPage implements OnInit { let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); let allEvents = mdEventsOficial.concat(mdEventsPessoal); - if(allEvents.length > 0){ + if(allEvents.length > 0) { this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; @@ -83,7 +83,7 @@ export class EventListPage implements OnInit { let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); let allEvents = prEventsOficial.concat(prEventsPessoal); - if(allEvents.length > 0){ + if(allEvents.length > 0) { this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); } this.showLoader = false; @@ -93,7 +93,7 @@ export class EventListPage implements OnInit { async openApproveModal(eventSerialNumber, data) { - let a = this.eventsMDGPRList.filter((elem)=>{ + let a = this.eventsMDGPRList.filter((elem) => { // return eventSerialNumber == elem.serialNumber }); diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index d73b88d6b..623155e2e 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -428,7 +428,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy deleteMessage(msgId: string, msg: MessageService) { this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId) if (msg.file.type == "application/webtrix") { - this.openViewDocumentModal(msg.file); + // this.openViewDocumentModal(msg.file); } else { @@ -436,17 +436,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy str = str.substring(1, ((str.length) - 1)); const encodedData = btoa(str); - /* let fullUrl; - fullUrl = "https://gabinetedigitalchat.dyndns.info" + url; - //fullUrl = "http://www.africau.edu/images/default/sample.pdf"; - this.frameUrl = fullUrl; */ let file = this.base64toBlob(encodedData, 'application/pdf') let fileURL = URL.createObjectURL(file) window.open(fileURL); - - // this.chatService.getDocumentDetails(fullUrl); + } } @@ -630,9 +625,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy resultType: CameraResultType.Base64, source: CameraSource.Camera }); - - //const imageData = await this.fileToBase64Service.convert(file) - // const response = await fetch('data:image/jpeg;base64,' + file.base64String!); const blob = await response.blob(); @@ -780,13 +772,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy const roomId = this.roomId const file: any = await this.fileService.getFileFromDevice(types); - - //if (file.type == "application/pdf") { - - - /* const imageData = await this.fileToBase64Service.convert(file).then((filee) => { - - }) */ if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 640cc2e23..b3e6ebf86 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -217,6 +217,7 @@ export class EditEventToApproveComponent implements OnInit { close() { this.modalController.dismiss(); + } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 05bddf273..bde50e4ff 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -123,38 +123,6 @@ export class EventsToApprovePage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital']) } - /* async openApproveModal(eventToAprove) { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - let InstanceId; - - if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){ - InstanceId = '' - } else { - InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId - } - - const modal = await this.modalController.create({ - component: ApproveEventPage, - componentProps:{ - serialNumber: eventToAprove.serialNumber, - InstanceId: InstanceId , - showAside: true, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - - - this.LoadToApproveEvents(); - }); - } */ doRefresh() {