bug fix by Peter

This commit is contained in:
Eudes Inácio
2023-06-13 11:47:56 +01:00
5 changed files with 12 additions and 45 deletions
-3
View File
@@ -3,7 +3,6 @@ import { BrowserModule, HammerModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router'; import { RouteReuseStrategy } from '@angular/router';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
// import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { StatusBar } from '@ionic-native/status-bar/ngx'; import { StatusBar } from '@ionic-native/status-bar/ngx';
import { AppRoutingModule } from './app-routing.module'; 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 { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
//import { File } from '@ionic-native/File/ngx';
import { WebView } from '@ionic-native/ionic-webview/ngx'; import { WebView } from '@ionic-native/ionic-webview/ngx';
import { FilePath } from '@ionic-native/file-path/ngx'; import { FilePath } from '@ionic-native/file-path/ngx';
import { Camera } from '@ionic-native/camera/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 { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { ChatService } from './services/chat.service'; import { ChatService } from './services/chat.service';
import {MatDatepickerModule} from '@angular/material/datepicker'; 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 {MAT_DATE_LOCALE} from '@angular/material/core';
import { Network } from '@ionic-native/network/ngx'; import { Network } from '@ionic-native/network/ngx';
import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx'; import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx';
@@ -45,14 +45,6 @@ export class DiplomasPage implements OnInit, OnDestroy {
private RouteService: RouteService, private RouteService: RouteService,
) { ) {
//Inicializar segment //Inicializar segment
this.activatedRoute.queryParams.subscribe(params => {
if (params['validar'] == 'true') {
this.segment = 'validar';
} else if (params['assinados'] == 'true') {
this.segment = 'assinados';
}
});
} }
ngOnInit() { ngOnInit() {
@@ -64,6 +56,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
this.segment = 'validar'; this.segment = 'validar';
} else if (params['segment'] == 'assinados') { } else if (params['segment'] == 'assinados') {
this.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() { async refreshing() {
setTimeout(() => { setTimeout(() => {
@@ -254,7 +254,7 @@
</div> </div>
</ion-item> </ion-item>
</ion-item-sliding> </ion-item-sliding>
</div> </div>
<!-- This is the box view --> <!-- This is the box view -->
@@ -307,7 +307,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- List --> <!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center"> <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center"> <div class="d-flex justify-center">
@@ -418,7 +418,7 @@ export class GabineteDigitalPage implements OnInit {
} }
else if (this.router.url == '/home/gabinete-digital?diplomasassinar=true') { else if (this.router.url == '/home/gabinete-digital?diplomasassinar=true') {
this.openDiplomasAssinarPage(); this.openDiplomasAssinarPage();
this.selectedElement = 'DiplomasAssinar'; this.selectedElement = 'DiplomasParaAssinar';
} }
else if (this.router.url == '/home/gabinete-digital?parecer=true') { else if (this.router.url == '/home/gabinete-digital?parecer=true') {
this.openPedidosPage('parecer') this.openPedidosPage('parecer')
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "8163e15f9", "shortSHA": "5cec6d8b7",
"SHA": "8163e15f9b6b0596eef404628416be8c675786c6", "SHA": "5cec6d8b76f33d2e625b2fa5f37606d5742d52e6",
"branch": "feature/gabinete-search", "branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'", "lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Jun 12 12:19:29 2023 +0100'", "lastCommitTime": "'Tue Jun 13 11:01:08 2023 +0100'",
"lastCommitMessage": "change", "lastCommitMessage": "changes",
"lastCommitNumber": "5011", "lastCommitNumber": "5013",
"change": "", "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" "changeAuthor": "eudes.inacio"
} }