peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-10 13:22:33 +01:00
parent a6218e39c7
commit 05e3e1a95c
16 changed files with 376 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+6 -4
View File
@@ -29,7 +29,7 @@
</div>
</div>
<div class="line"></div>
<div class="middle-content">
<div class="middle-content" >
<div *ngIf="intervenientes.length > 0">
<h5 >Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
@@ -40,9 +40,11 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<div *ngIf="cc!='' && cc!=' ' ">
.. {{ cc | json }} ..
<h5 *ngIf="cc.length > 0">Com conhecimento</h5>
<ion-item *ngIf="cc.length > 0" class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+5 -5
View File
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
@@ -17,9 +17,6 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
@@ -128,7 +125,10 @@ export class DespachoPrPage implements OnInit {
this.cc = users.filter(user=>{
return user.Type == 'CC';
}) || []
console.log(users);
if(!this.cc) {
this.cc = []
}
});
this.getDocumentDetails(this.task.FolderId, '361');
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+12 -8
View File
@@ -4,8 +4,9 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { NavigationStart, Router } from '@angular/router';
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
import { Location } from '@angular/common';
@Component({
selector: 'app-event-list',
@@ -32,7 +33,8 @@ export class EventListPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router
private router: Router,
private location: Location
) { }
ngOnInit() {
@@ -138,12 +140,14 @@ export class EventListPage implements OnInit {
this.modalController.dismiss(null);
}
goBack() {
if(this.router.url == '/home/agenda/event-list') {
this.router.navigate(['/home/agenda']);
}
else if(this.router.url == '/home/gabinete-digital/event-list'){
this.router.navigate(['/home/gabinete-digital']);
}
// if(this.router.url == '/home/agenda/event-list') {
// this.router.navigate(['/home/agenda']);
// }
// else if(this.router.url == '/home/gabinete-digital/event-list'){
// this.router.navigate(['/home/gabinete-digital']);
// }
this.location.back()
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+1 -1
View File
@@ -158,7 +158,7 @@ export class ExpedientePrPage implements OnInit {
"CreateDate":taskDate,
"DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Sender,
"Note": res.workflowInstanceDataFields.Note,
"Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID,