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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-18 09:24:13 +01:00
parent ab30b20a79 53d6896abf
commit 25b0b2a418
22 changed files with 187 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+3 -4
View File
@@ -68,9 +68,8 @@ export class AllProcessesPage implements OnInit {
this.allProcessesList = removeDuplicate( this.allProcessesList)
this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse();
});
//this.pendentesstore.reset(this.allProcessesList);
this.skeletonLoader = false;
this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){
@@ -98,8 +97,8 @@ export class AllProcessesPage implements OnInit {
let diffMinutes = minutes;
console.log(allday);
if(totalDays == 0){
if(allday){
if(totalDays == 0) {
if(allday) {
customDate = this.getCustomDate(start)+", "+this.getCustomHours(start)+" (todo dia)";
console.log(customDate);
return customDate;
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1
View File
@@ -60,6 +60,7 @@
</div>
</div>
</div>
</ion-list>
</div>
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+2 -2
View File
@@ -1,4 +1,4 @@
<ion-header class="ion-no-border">
<ion-header class="ion-no-border px-20">
<div class="title">
<div class="thetitle"><ion-label >Pedidos</ion-label></div>
<div class="theicon">
@@ -28,7 +28,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div class="width-100 overflow-y-auto height-100 px-20" [ngSwitch]="segment">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div *ngIf="pedidosstore.listparecer.length >= 1">
<ion-list *ngSwitchCase="'parecer'">
src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
padding: 30px 00px 0 00px !important;
margin: 0;
}
.title{
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+2 -2
View File
@@ -1,4 +1,4 @@
<ion-header class="ion-no-border">
<ion-header class="ion-no-border px-20">
<div class="title">
<div class="thetitle"><ion-label >Pendentes</ion-label></div>
<div class="theicon">
@@ -18,7 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100 overflow-y-auto height-100">
<div class="width-100 overflow-y-auto height-100 px-20">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<ion-list *ngIf="pendentesstore.list.length >= 1">
<div
src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
padding: 30px 00px 0 00px !important;
margin: 0;
}
.title{
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+7 -9
View File
@@ -4,21 +4,15 @@ 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 { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
@Component({
selector: 'app-despachos-pr-options',
@@ -45,7 +39,8 @@ export class DespachosPrOptionsPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private animationController: AnimationController,
private toastService: ToastService) { }
private toastService: ToastService,
private location: Location,) { }
ngOnInit() {
@@ -92,10 +87,12 @@ export class DespachosPrOptionsPage implements OnInit {
}
this.popoverController.dismiss('close')
});
}
sendExpedienteToPending(){
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
@@ -127,6 +124,7 @@ export class DespachosPrOptionsPage implements OnInit {
this.close();
this.openMenu(); */
}
this.popoverController.dismiss('close')
});
}
src/app/shared/popover/request-options/request-options.page.html
+1 -1
View File
@@ -32,7 +32,7 @@
<div class="solid"></div>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
<button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<!-- <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> -->
<button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
src/app/shared/popover/request-options/request-options.page.ts
+13 -21
View File
@@ -48,7 +48,6 @@ export class RequestOptionsPage implements OnInit {
console.log('serialnumber', this.serialnumber)
this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
if(!this.showEnviarPendentes) this.showEnviarPendentes = false
@@ -66,17 +65,16 @@ export class RequestOptionsPage implements OnInit {
};
}
close(){
close() {
if( window.innerWidth < 801){
this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
this.popoverController.dismiss('close');
} else {
this.modalController.dismiss('close');
}
this.router.navigate(['/home/gabinete-digital/pedidos']);
}
sendExpedienteToPending(){
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res);
this.close();
@@ -90,7 +88,7 @@ export class RequestOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
if( window.innerWidth <= 800) {
classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
@@ -108,7 +106,7 @@ export class RequestOptionsPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
this.popoverController.dismiss();
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800) {
@@ -129,18 +127,16 @@ export class RequestOptionsPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res=> {
console.log(res['data']);
if(res['data']=='openDiscart'){
if(res['data']=='openDiscart') {
console.log('open discart');
this.distartExpedientModal();
this.modalController.dismiss()
}
});
}
async distartExpedientModal(){
async distartExpedientModal() {
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
@@ -158,9 +154,6 @@ export class RequestOptionsPage implements OnInit {
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
this.close();
/* console.log('2Expedient Discard closed2');
this.close();
this.openMenu(); */
}
});
@@ -257,12 +250,9 @@ export class RequestOptionsPage implements OnInit {
this.toastService.badRequest('Processo não arquivado')
}
}
async openDarParecer(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
if( window.innerWidth <= 800){
@@ -280,12 +270,14 @@ export class RequestOptionsPage implements OnInit {
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
modal.onDidDismiss().then( () => {
this.popoverController.dismiss('close');
});
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
if( window.innerWidth <= 800){