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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-06-06 15:28:27 +01:00
parent 26bea32384
commit 13c77ff2ef
9 changed files with 29 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+6 -6
View File
@@ -318,10 +318,10 @@ export class DespachoPage implements OnInit {
try {
await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
this.toastService.successMessage('Processo descartado')
this.toastService._successMessage('Processo descartado')
this.close();
} catch (error) {
this.toastService.badRequest("Processo não descartado")
this.toastService._badRequest("Processo não descartado")
}
finally {
loader.remove()
@@ -371,10 +371,10 @@ export class DespachoPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.toastService._successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
this.toastService._badRequest()
} finally {
loader.remove()
}
@@ -390,10 +390,10 @@ export class DespachoPage implements OnInit {
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res => {
this.goBack();
this.toastService.successMessage()
this.toastService._successMessage()
},
error => {
this.toastService.badRequest("Processo não enviado para despacho")
this.toastService._badRequest("Processo não enviado para despacho")
});
}
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -1
View File
@@ -549,7 +549,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.loadCount = true;
}
let allProcessesList = allPreocesses_;
let allProcessesList = allPreocesses_ || [];
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
src/app/pages/publications/publications.page.ts
+15 -7
View File
@@ -310,6 +310,8 @@ export class PublicationsPage implements OnInit {
async AddPublicationFolder(item?: any) {
this.closeDesktopComponent();
this.idSelected = '';
if (window.innerWidth < 701) {
const modal = await this.modalController.create({
@@ -462,7 +464,19 @@ export class PublicationsPage implements OnInit {
showAddActions: false,
showEditActions: false,
}
this.idSelected = "";
setTimeout(()=>{
if(this.desktopComponent.showViewPublication == false &&
this.desktopComponent.showAddNewPublication == false &&
this.desktopComponent.showPublicationDetail == false &&
this.desktopComponent.showAddActions == false &&
this.desktopComponent.showEditActions == false) {
this.idSelected = "";
}
}, 10)
}
async openOptions(id?: string) {
@@ -514,10 +528,4 @@ export class PublicationsPage implements OnInit {
});
}
// this.crop.crop('path/to/image.jpg', {quality: 75})
// .then(
// newImage =>
// error => console.error('Error cropping image', error)
// );
}
src/app/pages/publications/view-publications/view-publications.page.ts
-29
View File
@@ -141,15 +141,6 @@ export class ViewPublicationsPage implements OnInit {
this.publicationList = new Array();
/* for(let i = 0; i < res.length; i++) {
this.publications.GetPublicationById(res[i]).subscribe(ress => {
let item: Publication = this.publicationPipe.itemList(ress)
this.publicationList.push(item);
})
} */
res.forEach(element => {
this.publications.GetPublicationById(element).subscribe(ress => {
@@ -167,17 +158,6 @@ export class ViewPublicationsPage implements OnInit {
this.getpublication = this.publicationList;
this.showLoader = false;
/* this.publicationList = new Array();
res.forEach(element => {
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
});
this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
this.publicationListStorage.add(folderId, this.publicationList)
this.getpublication = this.publicationList; */
}, (error) => {
this.getFromDB()
});
@@ -234,15 +214,6 @@ export class ViewPublicationsPage implements OnInit {
this.sqliteservice.getActionById(this.folderId).then((publications) => {
/* let item = {
ActionType: publications[0].ActionType,
DateBegin: publications[0].DateBegin,
DateEnd: publications[0].DateEnd,
Description: publications[0].Description,
Detail: publications[0].Detail,
ProcessId: publications[0].ProcessId
}
this.publicationDitails = item; */
this.item = this.isJson(publications[0].publicationsDetails);
let publicationArray = [];
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
-6
View File
@@ -151,8 +151,6 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -160,7 +158,6 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -189,8 +186,6 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -198,7 +193,6 @@
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
src/app/shared/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -189,7 +189,7 @@
<mat-option
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
>
{{recurring.Description}}
{{recurring.Description}}
</mat-option>
</mat-select>
</mat-form-field>
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+2 -1
View File
@@ -80,7 +80,8 @@ export class AllProcessesPage implements OnInit {
async loadAllProcesses() {
let allProcessesList = await this.processesService.GetTasksList("", false).toPromise();
//
allProcessesList = allProcessesList || [];
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
-57
View File
@@ -75,18 +75,6 @@
</div>
<div class="ion-input-class">
<!-- <ion-select placeholder="Selecione tipo de evento*"
class="d-block d-md-none"
[(ngModel)]="eventProcess.workflowInstanceDataFields.Category"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option>
<ion-select-option value="Viagem">Viagem</ion-select-option>
<ion-select-option value="Conferência">Conferência</ion-select-option>
<ion-select-option value="Encontro">Encontro</ion-select-option>
</ion-select> -->
<mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
<!-- <input matInput type="text" > -->
<mat-select [(ngModel)]="eventProcess.workflowInstanceDataFields.Category" >
@@ -116,24 +104,12 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class width-100">
<!-- <ion-datetime
class="d-block d-md-none"
placeholder="Início"
[(ngModel)]="startDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2022"
>
</ion-datetime> -->
<mat-form-field appearance="none"
class="width-100 date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[(ngModel)]="startDate"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -155,24 +131,12 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class width-100">
<!-- <ion-datetime
class="d-block d-md-none"
placeholder="Fim"
[(ngModel)]="endDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2025"
>
</ion-datetime> -->
<mat-form-field appearance="none"
class="width-100 date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[(ngModel)]="endDate"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -195,15 +159,6 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class">
<!-- <ion-select
placeholder="Selecione repetição"
class="d-block d-md-none"
[(ngModel)]="eventProcess.workflowInstanceDataFields.OccurrenceType"
(ngModelChange)="onSelectedRecurringChanged($event)"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}">{{recurring.Description}}</ion-select-option>
</ion-select> -->
<mat-form-field
class="width-100"
@@ -236,18 +191,6 @@
</div>
<div class="ion-input-class flex-grow-1">
<!-- <ion-datetime
class="d-block d-md-none"
placeholder="Última ocorrência"
[(ngModel)]="eventProcess.workflowInstanceDataFields.LastOccurrence"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
max="2025"
>
</ion-datetime> -->
<mat-form-field class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="occurrrence"
placeholder="Choose a date"
src/app/shared/publication/view-publications/view-publications.page.ts
+4 -4
View File
@@ -195,7 +195,7 @@ export class ViewPublicationsPage implements OnInit {
}
async openEditPublication(folderId?:any){
async openEditPublication(folderId?:any) {
if( window.innerWidth < 701) {
const modal = await this.modalController.create({
component: EditActionPage,
@@ -207,15 +207,15 @@ export class ViewPublicationsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(() => {
//Do nothing
// Do nothing
});
}
else{
else {
this.editPublication.emit(folderId);
}
}
async deletePublication(folderId?:any){
async deletePublication(folderId?:any) {
const loader = this.toastService.loading();
try {
await this.publications.DeletePresidentialAction(folderId).toPromise();