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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-21 12:58:40 +01:00
parent ad722c0fea
commit 3d14c66d98
12 changed files with 64 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+5
View File
@@ -69,6 +69,10 @@ export class DespachoPrPage implements OnInit {
}
});
window['tinyupdate'] = () => {
this.LoadTaskDetail(this.serialNumber);
}
}
@@ -118,6 +122,7 @@ export class DespachoPrPage implements OnInit {
let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
this.mergedArray = []
try {
this.getDraft(split_stringDraft);
} catch (error) {
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+6
View File
@@ -77,6 +77,11 @@ export class DespachoPage implements OnInit {
this.caller = params["params"].caller;
}
});
window['tinyupdate'] = () => {
this.LoadTaskDetail(this.serialnumber);
}
}
ngOnInit() {
@@ -113,6 +118,7 @@ export class DespachoPage implements OnInit {
console.log('sring to array', stringDraft)
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
this.mergedArray = []
try {
this.getDraft(split_stringDraft);
} catch (error) {
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+14 -80
View File
@@ -1,85 +1,19 @@
<ion-header class="ion-no-border">
<!-- <app-header > </app-header> -->
</ion-header>
<ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content width-100 d-flex justify-space-between">
<div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="middle d-flex align-center flex-grow-1 ">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()">
<!-- <ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button> -->
<ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
</div>
</div>
</div>
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span></p>
</ion-label>
<ion-label>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
<ion-label>
<p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
</ion-label>
</div>
</div>
<div class="line"></div>
<div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
<p>{{interveniente.Name}}</p>
</div>
</ion-label>
</ion-item>
<div *ngIf="cc.length > 0">
<h5 class="font-17-rem">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>
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5 class="font-17-rem">Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
</ion-item>
</div>
</div>
<div class="bottom-content width-100">
<ion-list>
<h5 class="font-17-rem">Documentos Anexados</h5>
<ion-item *ngFor="let attachment of mergedArray"
class="ion-no-margin ion-no-padding cursor-pointer"
>
<ion-label
(click)="viewDocument(attachment.DocId, attachment,attachment.content)"
>
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
<app-task-details
*ngIf="task"
[task]=task
[intervenientes]=intervenientes
[cc]=cc
[customDate]=customDate
[mergedArray]="mergedArray"
(openOptions)= openOptions()
(goBack)= goBack()
(viewDocument)=viewDocument($event)
class="content d-flex flex-column"
></app-task-details>
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+1 -2
View File
@@ -9,7 +9,7 @@
border-top-left-radius: 24px;
}
ion-content, .header-2, .main-content{
ion-content, .header-2{
padding: 30px 20px 0 20px !important;
}
@@ -37,7 +37,6 @@ ion-content, .header-2, .main-content{
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+8 -1
View File
@@ -61,6 +61,11 @@ export class DiplomaAssinarPage implements OnInit {
}
});
window['tinyupdate'] = () => {
this.LoadTaskDetail(this.serialnumber);
}
}
ngOnInit() {
@@ -125,6 +130,8 @@ export class DiplomaAssinarPage implements OnInit {
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
this.mergedArray = []
try {
this.getDraft(split_stringDraft);
} catch (error) {
@@ -160,7 +167,7 @@ export class DiplomaAssinarPage implements OnInit {
}
async viewDocument(docId: string, Document, content) {
async viewDocument({Document, content}) {
if (Document.content == "") {
const modal = await this.modalController.create({
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+6
View File
@@ -69,6 +69,11 @@ export class DiplomaPage implements OnInit {
});
window['tinyupdate'] = () => {
this.LoadTaskDetail(this.serialNumber);
}
}
ngOnInit() {
@@ -135,6 +140,7 @@ export class DiplomaPage implements OnInit {
let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
this.mergedArray = []
try {
this.getDraft(split_stringDraft);
} catch (error) {
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+9 -4
View File
@@ -278,10 +278,12 @@ ion-content{
width: 84%;
float: left;
ion-label{
margin: 0 !important;
padding: 2.5px 10.5px 2.5px 10.5px;
}
ion-label{
float: left;
display: inline;
margin: 0 !important;
padding: 2.5px 10.5px 2.5px 10.5px;
}
}
.item-icon{
@@ -697,6 +699,9 @@ ion-content{
font-size: rem(13);
}
.new-task {
float: left;
}
.search-input-container{
background-color: white;