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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-29 15:13:04 +01:00
parent c846aec4cb
commit fe362c3625
6 changed files with 23 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -46,7 +46,7 @@
</ion-select>
<mat-form-field class="d-none d-md-block width-100">
<mat-form-field floatLabel="never" class="d-none d-md-block width-100">
<mat-select placeholder="Selecione agenda" [(ngModel)]="postData.CalendarName" >
<mat-option value="Oficial">
Oficial
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+2 -10
View File
@@ -154,17 +154,9 @@ export class BookMeetingModalPage implements OnInit {
goBack() {
this.modalController.dismiss(null);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
window.history.back();
}
async saveTask(){
// issue12323423
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+6 -1
View File
@@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit {
fulltask: any;
eventsList: Event[];
serialnumber: string;
caller:string;
serialNumber: string;
profile: string;
intervenientes: any;
@@ -65,6 +66,9 @@ export class ExpedienteDetailPage implements OnInit {
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
}
if(params["params"].caller) {
this.caller = params["params"].caller;
}
});
@@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit {
}
goBack() {
if(this.task.Status == "Pending"){
if(this.task.Status == "Pending" && this.caller != 'events'){
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
@@ -111,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit {
}
}
else{
console.log('HERE');
this.activatedRoute.paramMap.subscribe(params => {
switch (params["params"].caller) {
case 'events':