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

Git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-02 18:28:17 +01:00
parent f7791805f3 702cb9429a
commit 8bd135c6f8
107 changed files with 1262 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+1 -1
View File
@@ -70,7 +70,7 @@
appearance="fill"
class="width-100 d-block"
appearance="none">
<mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de evento*">
<mat-select [(ngModel)]="selectedTypes" multiple placeholder="Selecione o tipo de assunto*">
<mat-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</mat-option>
</mat-select>
</mat-form-field>
src/app/modals/create-process/create-process.page.ts
+42 -7
View File
@@ -292,7 +292,12 @@ export class CreateProcessPage implements OnInit {
this.modalController.dismiss();
this.toastService._successMessage('Despacho criado');
} catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error?.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove()
@@ -324,7 +329,12 @@ export class CreateProcessPage implements OnInit {
this.toastService._successMessage('Pedido de Parecer enviado');
}
catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error?.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove()
}
@@ -349,7 +359,12 @@ export class CreateProcessPage implements OnInit {
this.toastService._successMessage('Pedido de Deferimento criado');
}
catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error?.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
}
finally {
loader.remove()
@@ -377,7 +392,12 @@ export class CreateProcessPage implements OnInit {
this.modalController.dismiss();
this.toastService._successMessage('Despacho criado');
} catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error?.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove();
}
@@ -413,7 +433,12 @@ export class CreateProcessPage implements OnInit {
this.toastService._successMessage('Pedido de Parecer criado');
}
catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove()
}
@@ -438,7 +463,12 @@ export class CreateProcessPage implements OnInit {
this.toastService._successMessage('Pedido de Deferimento criado');
}
catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove()
}
@@ -493,7 +523,12 @@ export class CreateProcessPage implements OnInit {
await this.processes.CompleteTask(body).toPromise();
this.toastService._successMessage(message);
} catch (error) {
this.toastService._badRequest('Processo não efectuado');
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Processo não efectuado');
}
} finally {
loader.remove()
}
src/app/modals/dar-parecer/dar-parecer.page.ts
+5 -1
View File
@@ -68,7 +68,11 @@ export class DarParecerPage implements OnInit {
this.modalController.dismiss('sucess');
this.toastService._successMessage('Parecer enviado');
} catch (error) {
this.toastService._badRequest("Parecer não solicitado");
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest("Parecer não solicitado");
}
} finally {
loader.remove()
}
src/app/modals/delegar/delegar.page.ts
+4
View File
@@ -107,7 +107,11 @@ export class DelegarPage implements OnInit {
this.close();
},
(error)=>{
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest("Processo não delegado")
}
},
()=>{
loader.remove()
src/app/modals/document-detail/document-detail.page.html
+1 -1
View File
@@ -83,7 +83,7 @@
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
</div>
</div>
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+25 -5
View File
@@ -230,7 +230,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.docs.push({
ApplicationId: e.ApplicationId || e.ApplicationType,
Source: 1,
SourceId: e.DocId || e.docID || e.docId || e.SourceId,
SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
SourceName: e.Assunto
})
})
@@ -239,7 +239,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.docs.push({
ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
Source: 1,
SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId,
SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id,
SourceName: this.document.Assunto
})
}
@@ -249,7 +249,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
Subject: this.postData.Subject,
Body: this.postData.Body.Text,
Location: this.postData.Location,
CalendarId: this.postData.CalendarName,
CalendarId: this.selectedCalendarId(),
CalendarName: this.postData.CalendarName,
StartDate: this.postData.StartDate,
EndDate: this.postData.EndDate,
@@ -277,7 +277,12 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.modalController.dismiss()
}, (error) => {
laoder.remove()
this.toastService._badRequest('Não foi possível marcar a reunião');
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Não foi possível marcar a reunião');
}
}, ()=>{
laoder.remove()
});
@@ -369,6 +374,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
modal.onDidDismiss().then((res)=> {
if(res){
const data = res.data;
console.log('data', data)
this.attachments.push(data.selected);
}
});
@@ -378,13 +384,27 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.attachments = this.attachments.filter( (e, i) => index != i);
}
validateFormInputs(){
validateFormInputs() {
let formLocation = this.postData.Location.trim();
if(!this.postData.Location && formLocation.length <= 0){
this.formLocationSatus = true;
}
}
selectedCalendarId () {
if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
return this._eventService.calendarNamesType[this.CalendarName]['OficialId']
} else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
return this._eventService.calendarNamesType[this.CalendarName]['PessoalId']
} else {
return '11:11'
}
}
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = taskParticipants;
this.taskParticipantsCc = taskParticipantsCc;
src/app/modals/forward/forward.page.ts
+7 -2
View File
@@ -147,11 +147,16 @@ export class ForwardPage implements OnInit {
"AttachmentList" :docs,
}
this.processes.CompleteParecerPrTask(body).subscribe(res=>{
this.toastService._successMessage('Processo delegado');
this.toastService._successMessage('Processo Reencaminhado');
this.goBack();
},
(error)=>{
this.toastService._badRequest("Processo não delegado")
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest("Processo não delegado")
}
});
}
}
src/app/modals/view-event/view-event.page.ts
+1 -5
View File
@@ -1,15 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, PopoverController, Platform, NavParams } from '@ionic/angular';
import { EventBody } from 'src/app/models/eventbody.model';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { ActivatedRoute, Router } from '@angular/router';
import { ProcessesService } from 'src/app/services/processes.service';import { ActivatedRoute, Router } from '@angular/router';
import { ToastService } from 'src/app/services/toast.service';
import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
import { Location } from '@angular/common'
import { SqliteService } from 'src/app/services/sqlite.service';
import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';