diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ec642a171..0651a6997 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,7 +3,6 @@ import { BrowserModule, HammerModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; -// import { SplashScreen } from '@ionic-native/splash-screen/ngx'; import { StatusBar } from '@ionic-native/status-bar/ngx'; import { AppRoutingModule } from './app-routing.module'; @@ -12,7 +11,6 @@ import { HttpClientModule } from '@angular/common/http'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -//import { File } from '@ionic-native/File/ngx'; import { WebView } from '@ionic-native/ionic-webview/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { Camera } from '@ionic-native/camera/ngx'; @@ -26,7 +24,6 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ChatService } from './services/chat.service'; import {MatDatepickerModule} from '@angular/material/datepicker'; -// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; import {MAT_DATE_LOCALE} from '@angular/material/core'; import { Network } from '@ionic-native/network/ngx'; import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx'; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 7e6d25901..1890325b3 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -45,14 +45,6 @@ export class DiplomasPage implements OnInit, OnDestroy { private RouteService: RouteService, ) { //Inicializar segment - - this.activatedRoute.queryParams.subscribe(params => { - if (params['validar'] == 'true') { - this.segment = 'validar'; - } else if (params['assinados'] == 'true') { - this.segment = 'assinados'; - } - }); } ngOnInit() { @@ -64,6 +56,10 @@ export class DiplomasPage implements OnInit, OnDestroy { this.segment = 'validar'; } else if (params['segment'] == 'assinados') { this.segment = 'assinados'; + } else if (params['diplomas']=='assinados') { + this.segment = 'assinados'; + } else if (params['diplomas']== 'validar') { + this.segment = 'validar'; } }); @@ -179,31 +175,6 @@ export class DiplomasPage implements OnInit, OnDestroy { } - pipeTask(element) { - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - - let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); - return { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": new Date(element.taskStartDate), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - "Deadline": element.Deadline, - "TaskStartDate": element.taskStartDate, - "TaskStatus": element.taskStatus, - "TaskReceiveDate": element.taskReceiveDate - } - } - - async refreshing() { setTimeout(() => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 65fc1b532..93615529a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -254,7 +254,7 @@ - + @@ -307,7 +307,6 @@ -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index f75c3d8bd..f92f56222 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -418,7 +418,7 @@ export class GabineteDigitalPage implements OnInit { } else if (this.router.url == '/home/gabinete-digital?diplomasassinar=true') { this.openDiplomasAssinarPage(); - this.selectedElement = 'DiplomasAssinar'; + this.selectedElement = 'DiplomasParaAssinar'; } else if (this.router.url == '/home/gabinete-digital?parecer=true') { this.openPedidosPage('parecer') diff --git a/version/git-version.ts b/version/git-version.ts index 0fcc77261..a92ecc0a5 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8163e15f9", - "SHA": "8163e15f9b6b0596eef404628416be8c675786c6", + "shortSHA": "5cec6d8b7", + "SHA": "5cec6d8b76f33d2e625b2fa5f37606d5742d52e6", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Mon Jun 12 12:19:29 2023 +0100'", - "lastCommitMessage": "change", - "lastCommitNumber": "5011", + "lastCommitTime": "'Tue Jun 13 11:01:08 2023 +0100'", + "lastCommitMessage": "changes", + "lastCommitNumber": "5013", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 4 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/theme/variables.scss", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 5 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file