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

improvements

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-09 05:46:01 +01:00
parent 8a68402643
commit 5c7fdf1f46
6 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+9
View File
@@ -219,6 +219,15 @@ const routes: Routes = [
]
},
{
path: 'document-detail',
children: [
{
path:'',
loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule)
}
]
},
]
},
{
src/app/modals/document-detail/document-detail.page.html
+18 -18
View File
@@ -6,23 +6,23 @@
</ion-header>
<ion-content>
<ion-list>
<ion-item >
<ion-item (click)="notImplemented()">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item >
<ion-item (click)="notImplemented()">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item >
<ion-item (click)="notImplemented()">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item >
<ion-item (click)="notImplemented()">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item >
<ion-item (click)="notImplemented()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
@@ -39,7 +39,7 @@
<ion-content>
<div class="main-content d-flex">
<div class="content d-flex flex-column" >
<div *ngIf="LoadedDocument" class="content d-flex flex-column" >
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
@@ -56,7 +56,7 @@
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">Sexta, 14 de Abril</span><span class="label">{{LoadedDocument.Type}}</span></p>
<p><span class="date">{{customDate}}</span><span class="label">{{LoadedDocument.Type}}</span></p>
</ion-label>
</div>
</div>
@@ -80,9 +80,9 @@
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label
>
(click)="viewDocument()">
<p class="attach-title-item">{{LoadedDocument.Subject}}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{LoadedDocument.UserName}}</span><span class="span-right"></span></p>
<p hidden><span class="span-left">Remetente</span><span class="span-right"></span></p>
</ion-label>
</ion-item>
</ion-list>
@@ -91,17 +91,17 @@
</div>
<div class="aside-right flex-column height-100">
<div class="buttons">
<button class="btn-ok" shape="round" >Efectuar Despacho</button>
<button class="btn-cancel" shape="round" >Descartar</button>
<button (click)="notImplemented()" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button class="btn-cancel" shape="round" >Marcar Reunião</button>
<button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div class="solid"></div>
<button class="btn-cancel" shape="round" >Executar</button>
<button class="btn-cancel" shape="round" >Delegar</button>
<button class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Executar</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Delegar</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Arquivar</button>
</div>
</div>
src/app/modals/document-detail/document-detail.page.ts
+12 -1
View File
@@ -11,9 +11,14 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
})
export class DocumentDetailPage implements OnInit {
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
customDate:any;
docId: string;
applicationId:string;
LoadedDocument:any;
LoadedDocument:any = null;
constructor(
private navParams: NavParams,
@@ -37,6 +42,9 @@ export class DocumentDetailPage implements OnInit {
this.processes.GetDocumentDetails(this.docId, '').subscribe(res=>{
console.log(res);
this.LoadedDocument = res[0];
let thedate = new Date(this.LoadedDocument.DateDocument);
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
});
}
@@ -57,5 +65,8 @@ export class DocumentDetailPage implements OnInit {
close(){
this.modalController.dismiss();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+11 -9
View File
@@ -74,7 +74,7 @@
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">Sexta, 14 de Abril</span><span class="label">Expediente</span></p>
<p><span class="date">{{customDate}}</span><span class="label">Expediente</span></p>
<p><span class="color-red">Muitíssimo urgente</span></p>
</ion-label>
</div>
@@ -89,14 +89,16 @@
</div>
</ion-label>
</ion-item>
<h5 *ngIf="cc">Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
</div>
</ion-label>
</ion-item>
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
</div>
</ion-label>
</ion-item>
</div>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+10
View File
@@ -22,6 +22,11 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
})
export class ExpedienteDetailPage implements OnInit {
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
customDate:any;
task: any;
fulltask: any;
eventsList: Event[];
@@ -81,6 +86,11 @@ export class ExpedienteDetailPage implements OnInit {
}
this.fulltask = res;
console.log(res);
let thedate = new Date(this.task.CreateDate);
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
this.intervenientes = users.filter(user=>{
return user.Type == 'I';
src/app/pages/search/search.page.ts
+3 -3
View File
@@ -26,10 +26,10 @@ export class SearchPage implements OnInit {
searchDocTypeId: string;
ordinance: string;
searchCategories: SearchCategory[];
showSearchDocuments: SearchDocument[];
searchCategories: SearchCategory[] = [];
showSearchDocuments: SearchDocument[] = [];
showCategory: string;
searchDocuments: SearchDocument[];
searchDocuments: SearchDocument[] =[];
showDocuments = false;
showAdvanceSearch = false;