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

fix for ios

Browse Source
This commit is contained in:
Lorito Tiago
2023-07-27 12:58:01 +01:00
parent d31394ad39
commit 535b8f852d
16 changed files with 2032 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/App/App.xcodeproj/project.pbxproj
+4 -4
View File
@@ -363,13 +363,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.2; MARKETING_VERSION = 2.0.1;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste; PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@@ -388,13 +388,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS;
INFOPLIST_FILE = App/Info.plist; INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.2; MARKETING_VERSION = 2.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste; PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
src/app/pages/gabinete-digital/despachos/despachos.page.html
+35 -41
View File
@@ -3,51 +3,52 @@
</ion-header> </ion-header>
<ion-header class="ion-no-border header-2"> <ion-header class="ion-no-border header-2">
<div class="title d-flex align-center">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="title flex-1"><ion-label >Despachos</ion-label></div> <div class="title d-flex align-center">
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="title flex-1"><ion-label>Despachos</ion-label></div>
<div class="theicon btn-refresh d-flex align-center"> <div class="theicon btn-refresh d-flex align-center">
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
<div> <div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
<mat-option value="OverdueTasks"> <mat-option value="OverdueTasks">
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
@@ -60,24 +61,18 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100"> <div class="main-content width-100 overflow-y-auto height-100">
<div > <div>
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="height-100"> <div class="height-100">
<ion-list> <ion-list>
<div <div class=" ion-no-padding ion-no-margin cursor-pointer"
class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of despachoStore.list; let i = index" (click)="GoToDespacho(task.SerialNumber)">
*ngFor = "let task of despachoStore.list; let i = index"
(click)="GoToDespacho(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
@@ -87,8 +82,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -102,7 +99,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -112,15 +109,13 @@
</div> </div>
</div> </div>
<div <div *ngIf="!skeletonLoader && despachoStore.list.length == 0"
*ngIf="!skeletonLoader && despachoStore.list.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
<div *ngIf="skeletonLoader && (despachoStore.list.length == null || despachoStore.list.length == 0)"> <div *ngIf="skeletonLoader && (despachoStore.list.length == null || despachoStore.list.length == 0)">
<ion-list> <ion-list>
<ion-item> <ion-item>
<ion-thumbnail slot="end"> <ion-thumbnail slot="end">
@@ -146,5 +141,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+29 -31
View File
@@ -6,31 +6,32 @@
<ion-header class="ion-no-border header-2"> <ion-header class="ion-no-border header-2">
<div class="title"> <div class="title">
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss> <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="thetitle"><ion-label >Diplomas</ion-label></div> <div class="thetitle"><ion-label>Diplomas</ion-label></div>
<div class="theicon btn-refresh d-flex align-center"> <div class="theicon btn-refresh d-flex align-center">
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
@@ -38,7 +39,7 @@
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
@@ -48,7 +49,9 @@
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon> <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button> </button>
</div> </div>
<div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas por Assinar PR</h3></div> <div class="bottom-title d-flex">
<h3 class="bottom-text">Diplomas por Assinar PR</h3>
</div>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
@@ -56,11 +59,8 @@
<div class="main-content width-100 overflow-y-auto height-100"> <div class="main-content width-100 overflow-y-auto height-100">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
@@ -69,24 +69,25 @@
<div class="width-100" *ngIf="deplomasStore.diplomasParaAssinarList"> <div class="width-100" *ngIf="deplomasStore.diplomasParaAssinarList">
<div *ngIf="deplomasStore.diplomasParaAssinarList"> <div *ngIf="deplomasStore.diplomasParaAssinarList">
<ion-list > <ion-list>
<div <div class=" ion-no-padding ion-no-margin cursor-pointer"
class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of deplomasStore.diplomasParaAssinarList"
*ngFor = "let task of deplomasStore.diplomasParaAssinarList" (click)="goToDiploma(task.SerialNumber || task.serialNumber)">
(click)="goToDiploma(task.SerialNumber || task.serialNumber)"
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject d-flex align-center"> <div class="subject d-flex align-center">
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label> <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio ||
task.workflowInstanceDataFields.Subject }}</ion-label>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span> <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -100,7 +101,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -110,10 +111,8 @@
</div> </div>
<!-- Empty --> <!-- Empty -->
<div <div *ngIf="!skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0"
*ngIf="!skeletonLoader && deplomasStore.diplomasParaAssinarList.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -144,5 +143,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+36 -42
View File
@@ -6,9 +6,9 @@
<ion-header class="ion-no-border header-2"> <ion-header class="ion-no-border header-2">
<div class="title d-flex align-center"> <div class="title d-flex align-center">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss> <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
<div class="title"><ion-label >Diplomas por Elaborar</ion-label></div> <div class="title"><ion-label>Diplomas por Elaborar</ion-label></div>
<div class="theicon btn-refresh"> <div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)"> <button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon> <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -20,14 +20,11 @@
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100"> <div class="main-content width-100 overflow-y-auto height-100">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
@@ -45,14 +42,18 @@
</p> </p>
</div> </div>
<div> <div>
<div *ngIf="ordinance == 'old'" (click)="reorderList('recent')"> <div *ngIf="ordinance == 'old'" (click)="reorderList('recent')">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-up.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-arrow-arrow-up.svg"></ion-icon> src="assets/images/icons-arrow-arrow-up.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-arrow-arrow-up.svg"></ion-icon>
</div> </div>
<div *ngIf="ordinance == 'recent'" (click)="reorderList('old')"> <div *ngIf="ordinance == 'recent'" (click)="reorderList('old')">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-arrow-arrow-down.svg"></ion-icon> src="assets/images/icons-arrow-arrow-down-25.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-arrow-arrow-down.svg"></ion-icon>
</div> </div>
</div> </div>
</div> </div>
@@ -61,12 +62,9 @@
<div class="width-100" *ngIf="deplomasStore.DiplomaGerarList.length >= 1"> <div class="width-100" *ngIf="deplomasStore.DiplomaGerarList.length >= 1">
<div *ngIf="deplomasStore.DiplomaGerarList"> <div *ngIf="deplomasStore.DiplomaGerarList">
<ion-list > <ion-list>
<div <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of deplomasStore.DiplomaGerarList"
class=" ion-no-padding ion-no-margin cursor-pointer" (click)="goToDiploma(task.SerialNumber)">
*ngFor = "let task of deplomasStore.DiplomaGerarList"
(click)="goToDiploma(task.SerialNumber)"
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject d-flex align-center"> <div class="subject d-flex align-center">
@@ -75,8 +73,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -90,7 +90,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -100,10 +100,8 @@
</div> </div>
<!-- Empty --> <!-- Empty -->
<div <div *ngIf="!skeletonLoader && diplomasList.length == 0"
*ngIf="!skeletonLoader && diplomasList.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -138,15 +136,12 @@
<div class="main-content width-100 overflow-y-auto height-100"> <div class="main-content width-100 overflow-y-auto height-100">
<div > <div>
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="height-100"> <div class="height-100">
<ion-list> <ion-list>
<div <div class="expediente ion-no-padding ion-no-margin cursor-pointer"
class="expediente ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of deplomasStore.DiplomaGerarList; let i = index" (click)="goToDiploma(task.SerialNumber)">
*ngFor = "let task of deplomasStore.DiplomaGerarList; let i = index"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100"> <div class="item width-100">
<div class="exp-top-detail"> <div class="exp-top-detail">
@@ -156,8 +151,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -171,7 +168,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -181,15 +178,13 @@
</div> </div>
</div> </div>
<div <div *ngIf="!skeletonLoader && deplomasStore.DiplomaGerarList.length == 0"
*ngIf="!skeletonLoader && deplomasStore.DiplomaGerarList.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
<div *ngIf="skeletonLoader && deplomasStore.DiplomaGerarList.length == 0"> <div *ngIf="skeletonLoader && deplomasStore.DiplomaGerarList.length == 0">
<ion-list> <ion-list>
<ion-item> <ion-item>
<ion-thumbnail slot="end"> <ion-thumbnail slot="end">
@@ -215,5 +210,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+67 -77
View File
@@ -1,14 +1,8 @@
<ion-header class="ion-no-border header-2"> <ion-header class="ion-no-border header-2">
<app-task-list-header <app-task-list-header [goBackButton]=true [headerName]="headerName" [ordinance]=ordinance [loading]=skeletonLoader
[goBackButton] = true (reorderList)=reorderList($event) (changeFilterName)=changeFilterName($event)
[headerName] = "headerName" (goBack)=goBack()></app-task-list-header>
[ordinance] = ordinance
[loading] = skeletonLoader
(reorderList) = reorderList($event)
(changeFilterName) = changeFilterName($event)
(goBack) = goBack()
></app-task-list-header>
<ion-toolbar> <ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)"> <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -37,40 +31,38 @@
<ion-list *ngSwitchCase="'validar'"> <ion-list *ngSwitchCase="'validar'">
<div *ngIf="listDiplomasPorValidar.length >= 1"> <div *ngIf="listDiplomasPorValidar.length >= 1">
<ion-item <ion-item class=" ion-no-padding cursor-pointer" *ngFor="let task of listDiplomasPorValidar"
class=" ion-no-padding cursor-pointer" (click)="goToDiploma(task.SerialNumber)" lines="none">
*ngFor = "let task of listDiplomasPorValidar" <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
(click)="goToDiploma(task.SerialNumber)" <div class="exp-top-detail">
lines="none" <div class="subject d-flex align-center">
> <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<div class="exp-top-detail"> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
<div class="subject d-flex align-center"> </div>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label> <div class="exp-icon">
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div> </div>
<div class="exp-icon"> <div class="exp-bottom-detail">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <div class="exp-remetente">
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> <ion-label>{{task.Senders}}</ion-label>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> </div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div> </div>
</div> </div>
<div class="exp-bottom-detail"> </ion-item>
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</ion-item>
</div> </div>
<div *ngIf="listDiplomasPorValidar.length == 0 && skeletonLoader"> <div *ngIf="listDiplomasPorValidar.length == 0 && skeletonLoader">
@@ -97,9 +89,9 @@
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
<div *ngIf="listDiplomasPorValidar.length == 0 && !skeletonLoader" <div *ngIf="listDiplomasPorValidar.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"> class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -109,39 +101,37 @@
<ion-list *ngSwitchCase="'assinados'"> <ion-list *ngSwitchCase="'assinados'">
<div *ngIf="listDiplomasAssinadosPR.length >= 1"> <div *ngIf="listDiplomasAssinadosPR.length >= 1">
<ion-item <ion-item class=" ion-no-padding cursor-pointer" *ngFor="let task of listDiplomasAssinadosPR"
class=" ion-no-padding cursor-pointer" (click)="goToDiploma(task.SerialNumber)" lines="none">
*ngFor = "let task of listDiplomasAssinadosPR" <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
(click)="goToDiploma(task.SerialNumber)" <div class="exp-top-detail">
lines="none" <div class="subject d-flex">
> <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<div class="exp-top-detail"> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
<div class="subject d-flex"> </div>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label> <div class="exp-icon">
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div> </div>
<div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</ion-item> </ion-item>
</div> </div>
@@ -171,14 +161,14 @@
</div> </div>
<div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader" <div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
class="empty-list d-flex height-100 align-center justify-content-center"> class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
</ion-list> </ion-list>
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/pages/gabinete-digital/expediente/expediente.page.html
+52 -51
View File
@@ -2,9 +2,12 @@
<div class="header-content"> <div class="header-content">
<div class="header-icon-left"> <div class="header-icon-left">
<button class="btn-no-color cursor-pointer" (click)="goBack()"> <button class="btn-no-color cursor-pointer" (click)="goBack()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon> src="assets/images/icons-arrow-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> <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>
</button> </button>
</div> </div>
<div class="header-title"> <div class="header-title">
@@ -15,31 +18,32 @@
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
@@ -48,13 +52,13 @@
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button class="btn-no-color" (click)="doRefresh($event)"> <button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon> <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -66,53 +70,50 @@
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content d-flex height-100" > <div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100 overflow-y-auto px-20"> <div class="content d-flex flex-column width-100 overflow-y-auto px-20">
<ion-list> <ion-list>
<div <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of list"
class=" ion-no-padding ion-no-margin cursor-pointer" (click)="goToExpediente(task.SerialNumber)">
*ngFor = "let task of list" <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
(click)="goToExpediente(task.SerialNumber)" <div class="exp-top-detail">
> <div class="subject d-flex align-center">
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label>
<div class="exp-top-detail"> <span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span>
<div class="subject d-flex align-center"> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Subject }}</ion-label> </div>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline)">Para hoje</span> <div class="exp-icon">
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div>
</div> </div>
<div class="exp-icon"> <div class="exp-bottom-detail">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon> <div class="exp-remetente">
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> <ion-label>{{task.Senders}}</ion-label>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> </div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div> </div>
</div> </div>
<div class="exp-bottom-detail">
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div>
</div>
</div>
</div> </div>
</ion-list> </ion-list>
<div <div *ngIf="!skeletonLoader && list.length == 0 && list.length == 0"
*ngIf="!skeletonLoader && list.length == 0 && list.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -145,4 +146,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/pages/gabinete-digital/gabinete-digital.page.html
+824 -600
View File
File diff suppressed because it is too large Load Diff
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+650 -578
View File
File diff suppressed because it is too large Load Diff
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+52 -57
View File
@@ -3,45 +3,49 @@
</ion-header> </ion-header>
<ion-header class="ion-no-border header-2"> <ion-header class="ion-no-border header-2">
<div class="title d-flex justify-space-between"> <div class="title d-flex justify-space-between">
<div class="d-flex align-center" (click)="goBack()"> <div class="d-flex align-center" (click)="goBack()">
<div class="d-flex align-center font-35-rem"> <div class="d-flex align-center font-35-rem">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end"
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon> src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/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>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end"
src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
</div> </div>
<div class="thetitle"><ion-label >Pedidos</ion-label></div> <div class="thetitle"><ion-label>Pedidos</ion-label></div>
</div> </div>
<div class="theicon btn-refresh d-flex"> <div class="theicon btn-refresh d-flex">
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
@@ -49,8 +53,8 @@
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
@@ -64,7 +68,7 @@
</div> </div>
<ion-toolbar> <ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" > <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="parecer"> <ion-segment-button value="parecer">
Parecer Parecer
</ion-segment-button> </ion-segment-button>
@@ -77,14 +81,11 @@
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content width-100 overflow-y-auto height-100"> <div class="main-content width-100 overflow-y-auto height-100">
@@ -94,11 +95,8 @@
<ion-list *ngSwitchCase="'parecer'"> <ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of pedidosstorage.listparecer; let i = index" <!-- *ngFor = "let task of pedidosstorage.listparecer; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" --> (click)="viewExpedientDetail(task.SerialNumber)" -->
<div <div class="ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of pedidosstorage.listparecer"
class="ion-no-padding ion-no-margin cursor-pointer" (click)="goToPedido(task.SerialNumber)">
*ngFor = "let task of pedidosstorage.listparecer"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" --> <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -109,8 +107,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -124,7 +124,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -134,11 +134,8 @@
</div> </div>
<div *ngIf="pedidosstorage.listdeferimento"> <div *ngIf="pedidosstorage.listdeferimento">
<ion-list *ngSwitchCase="'deferimento'"> <ion-list *ngSwitchCase="'deferimento'">
<div <div class="expediente ion-no-padding ion-no-margin cursor-pointer"
class="expediente ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of pedidosstorage.listdeferimento" (click)="goToPedido(task.SerialNumber)">
*ngFor = "let task of pedidosstorage.listdeferimento"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" --> <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100"> <div class="item width-100">
@@ -149,8 +146,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -164,7 +163,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -174,26 +173,23 @@
</div> </div>
<div [ngSwitch]="segment"> <div [ngSwitch]="segment">
<div *ngSwitchCase="'parecer'" class="centered-div d-flex height-100 align-center justify-content-center" > <div *ngSwitchCase="'parecer'" class="centered-div d-flex height-100 align-center justify-content-center">
<div <div *ngIf="pedidosstorage.listparecer.length == 0"
*ngIf="pedidosstorage.listparecer.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center" <span>Lista vazia</span>
> </div>
<span>Lista vazia</span> </div>
<div *ngSwitchCase="'deferimento'" class="centered-div d-flex height-100 align-center justify-content-center">
<div *ngIf="pedidosstorage.listdeferimento.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span>
</div>
</div> </div>
</div> </div>
<div *ngSwitchCase="'deferimento'" class="centered-div d-flex height-100 align-center justify-content-center"> <div
<div *ngIf="skeletonLoader && pedidosstorage.listdeferimento.length == 0 && skeletonLoader && pedidosstorage.listparecer.length == 0">
*ngIf="pedidosstorage.listdeferimento.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
</div>
<div *ngIf="skeletonLoader && pedidosstorage.listdeferimento.length == 0 && skeletonLoader && pedidosstorage.listparecer.length == 0">
<ion-list> <ion-list>
<ion-item> <ion-item>
@@ -221,5 +217,4 @@
</div> </div>
</ion-content> </ion-content>
src/app/shared/agenda/edit-event/edit-event.page.html
+64 -76
View File
@@ -1,10 +1,10 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar"> <ion-toolbar class="header-toolbar">
<div class="main-header"> <div class="main-header">
<div class="title-content"> <div class="title-content">
<div class="middle"> <div class="middle">
<ion-label id="edit-event-desktop" class="title">Editar Evento</ion-label> <br> <ion-label id="edit-event-desktop" class="title">Editar Evento</ion-label> <br>
<i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i> <i style="margin-top: -3px; font-size: 15px;"> Campos marcados com * são obrigatórios</i>
</div> </div>
</div> </div>
<ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
@@ -15,12 +15,13 @@
<ion-content> <ion-content>
<div class="main-content"> <div class="main-content">
<div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom "> <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="_postEvent.Subject"></ion-input> <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*"
[(ngModel)]="_postEvent.Subject"></ion-input>
</div> </div>
<div *ngIf="Form && validateFrom" > <div *ngIf="Form && validateFrom">
<div *ngIf="Form.get('Subject').invalid " class="input-errror-message"> <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
<div *ngIf="Form.get('Subject').errors?.required"> <div *ngIf="Form.get('Subject').errors?.required">
</div> </div>
<div *ngIf="Form.get('Subject').errors?.minlength"> <div *ngIf="Form.get('Subject').errors?.minlength">
O campo deve ter pelo menos 4 caracteres. O campo deve ter pelo menos 4 caracteres.
@@ -34,7 +35,8 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom "> <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="_postEvent.Location"></ion-input> <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*"
[(ngModel)]="_postEvent.Location"></ion-input>
</div> </div>
</div> </div>
<!-- Error messages --> <!-- Error messages -->
@@ -61,10 +63,10 @@
</div> --> </div> -->
<div *ngIf="Form && validateFrom" > <div *ngIf="Form && validateFrom">
<div *ngIf="Form.get('Location').invalid " class="input-errror-message"> <div *ngIf="Form.get('Location').invalid " class="input-errror-message">
<div *ngIf="Form.get('Location').errors?.required"> <div *ngIf="Form.get('Location').errors?.required">
</div> </div>
<div *ngIf="Form.get('Location').errors?.minlength"> <div *ngIf="Form.get('Location').errors?.minlength">
O campo deve ter pelo menos 4 caracteres. O campo deve ter pelo menos 4 caracteres.
@@ -79,7 +81,7 @@
</div> </div>
<div class="ion-input-class flex-grow-1"> <div class="ion-input-class flex-grow-1">
<mat-form-field appearance="none" floatLabel="never" class="width-100 " > <mat-form-field appearance="none" floatLabel="never" class="width-100 ">
<mat-select placeholder="Selecione agenda*" [(ngModel)]="_postEvent.CalendarName" [disabled]=true> <mat-select placeholder="Selecione agenda*" [(ngModel)]="_postEvent.CalendarName" [disabled]=true>
<mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}"> <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
Agenda {{ calendars }} Agenda {{ calendars }}
@@ -96,11 +98,12 @@
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div> </div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Categories')?.invalid && validateFrom "> <div class="ion-input-class flex-grow-1"
[class.input-error]="Form?.get('Categories')?.invalid && validateFrom ">
<mat-form-field appearance="none" floatLabel="never" class="width-100" required> <mat-form-field appearance="none" floatLabel="never" class="width-100" required>
<!-- <input matInput type="text" > --> <!-- <input matInput type="text" > -->
<mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="_postEvent.Category" > <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="_postEvent.Category">
<mat-option value="Reunião"> <mat-option value="Reunião">
Reunião Reunião
</mat-option> </mat-option>
@@ -128,19 +131,11 @@
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom "> <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<mat-form-field appearance="none" floatLabel="never" class="date-hour-picker"> <mat-form-field appearance="none" floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1" <input matInput [ngxMatDatetimePicker]="picker1" placeholder="Choose a date"
placeholder="Choose a date" [(ngModel)]="_postEvent.StartDate" [max]="maxDate" [disabled]="disabled">
[(ngModel)]="_postEvent.StartDate"
[max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle> <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1 <ngx-mat-datetime-picker #picker1 [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[showSpinners]="showSpinners" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi">
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[touchUi]="touchUi">
</ngx-mat-datetime-picker> </ngx-mat-datetime-picker>
</mat-form-field> </mat-form-field>
@@ -149,26 +144,18 @@
</div> </div>
<div class="container-div"> <div class="container-div">
<div class="ion-item-class-2 width-100 d-flex"> <div class="ion-item-class-2 width-100 d-flex">
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div> </div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom "> <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker"> <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim" <input matInput [ngxMatDatetimePicker]="fim" placeholder="Choose a date" [(ngModel)]="_postEvent.EndDate"
placeholder="Choose a date" [max]="maxDate" [disabled]="disabled" [min]="_postEvent.StartDate">
[(ngModel)]="_postEvent.EndDate"
[max]="maxDate"
[disabled]="disabled"
[min]="_postEvent.StartDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle> <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim <ngx-mat-datetime-picker #fim [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[showSpinners]="showSpinners" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond">
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond">
</ngx-mat-datetime-picker> </ngx-mat-datetime-picker>
</mat-form-field> </mat-form-field>
@@ -208,20 +195,11 @@
<div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1"> <div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
<mat-form-field class="date-hour-picker"> <mat-form-field class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="occurrrence" <input matInput [ngxMatDatetimePicker]="occurrrence" placeholder="Choose a date"
placeholder="Choose a date" [(ngModel)]="_postEvent.EventRecurrence.LastOccurrence" [disabled]="disabled" [min]="_postEvent.EndDate">
[(ngModel)]="_postEvent.EventRecurrence.LastOccurrence"
[disabled]="disabled"
[min]="_postEvent.EndDate"
>
<mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle> <mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #occurrrence <ngx-mat-datetime-picker #occurrrence [showSpinners]="showSpinners" [showSeconds]="showSeconds"
[showSpinners]="showSpinners" [stepHour]="stepHour" [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi">
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[touchUi]="touchUi"
>
</ngx-mat-datetime-picker> </ngx-mat-datetime-picker>
</mat-form-field> </mat-form-field>
@@ -236,7 +214,8 @@
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div> </div>
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom"> <div class="ion-input-class-no-height"
[class.input-error]="Form?.get('participantes')?.invalid && validateFrom">
<div class="list-people"> <div class="list-people">
<ion-item lines="none"> <ion-item lines="none">
<ion-list> <ion-list>
@@ -247,8 +226,10 @@
</div> </div>
<div class="add-people"> <div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipants()"> <button class="btn-no-color cursor-pointer" (click)="addParticipants()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start"
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon> src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start"
src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button> </button>
</div> </div>
</div> </div>
@@ -260,7 +241,8 @@
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div> </div>
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom"> <div class="ion-input-class-no-height"
[class.input-error]="Form?.get('participantes')?.invalid && validateFrom">
<div class="list-people"> <div class="list-people">
<ion-item lines="none"> <ion-item lines="none">
<ion-list> <ion-list>
@@ -271,8 +253,10 @@
</div> </div>
<div class="add-people"> <div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()"> <button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start"
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon> src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start"
src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button> </button>
</div> </div>
</div> </div>
@@ -285,17 +269,20 @@
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div> </div>
<div class="ion-input-class-no-height width-100"> <div class="ion-input-class-no-height width-100">
<ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="_postEvent.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea> <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="_postEvent.Body.Text"
placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
</div> </div>
</div> </div>
</div> </div>
<div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border cursor-pointer" > <div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border cursor-pointer">
<ion-label> <ion-label>
<div class="attach-icon"> <div class="attach-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-attach-doc.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-attach-doc.svg"></ion-icon> src="assets/images/theme/gov/icons-attach-doc.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' "
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-attach-doc.svg"></ion-icon>
</div> </div>
<div class="attach-document"> <div class="attach-document">
<ion-label>Adicionar documentos</ion-label> <ion-label>Adicionar documentos</ion-label>
@@ -304,22 +291,23 @@
</div> </div>
<div class="d-flex container-div width-100" *ngFor="let document of loadedEventAttachments; let i = index" > <div class="d-flex container-div width-100" *ngFor="let document of loadedEventAttachments; let i = index">
<ion-list class="width-100 list" *ngIf="!document.remove"> <ion-list class="width-100 list" *ngIf="!document.remove">
<ion-item class="width-100"> <ion-item class="width-100">
<ion-label class="width-100"> <ion-label class="width-100">
<p class="d-flex ion-justify-content-between"> <p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span> <span class="attach-title-item">{{document.SourceName}}</span>
<span class="app-name" *ngIf="document.ApplicationId == '8'"> Correspondencia </span> <span class="app-name" *ngIf="document.ApplicationId == '8'"> Correspondencia </span>
<span class="app-name" *ngIf="document.ApplicationId == '386'"> AccoesPresidenciais </span> <span class="app-name" *ngIf="document.ApplicationId == '386'"> AccoesPresidenciais </span>
<span class="app-name" *ngIf="document.ApplicationId == '361' "> ArquivoDespachoElect </span> <span class="app-name" *ngIf="document.ApplicationId == '361' "> ArquivoDespachoElect </span>
<span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)" > <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id, i)">
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon> <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span> </span>
</p> </p>
<p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p> <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate |
</ion-label> date: 'dd-MM-yyyy HH:mm'}} </span></p>
</ion-item> </ion-label>
</ion-item>
</ion-list> </ion-list>
</div> </div>
@@ -339,4 +327,4 @@
</button> </button>
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-footer> </ion-footer>
src/app/shared/agenda/view-event/view-event.page.html
+35 -21
View File
@@ -1,12 +1,15 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar"> <ion-toolbar class="header-toolbar">
<div class="main-header px-20" style="overflow: unset !important;"> <div class="main-header px-20" style="overflow: unset !important;">
<div class="title-content d-flex" > <div class="title-content d-flex">
<div class="left"> <div class="left">
<button class="btn-no-color" (click)="close()"> <button class="btn-no-color" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-calendar-arrow-left.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end"
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon> src='assets/images/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/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>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end"
src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
</button> </button>
</div> </div>
<div class="middle" (click)="openOptions()"> <div class="middle" (click)="openOptions()">
@@ -15,15 +18,18 @@
<div class="div-icon d-flex align-base"> <div class="div-icon d-flex align-base">
<button class="btn-no-color" (click)="editEvent()"> <button class="btn-no-color" (click)="editEvent()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end"
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon> src="assets/images/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end"
src="assets/images/theme/gov/icons-edit.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg"></ion-icon>
</button> </button>
<button class="btn-no-color" (click)="deleteYesOrNo()"> <button class="btn-no-color" (click)="deleteYesOrNo()">
<ion-icon class="delete" name="trash-sharp"></ion-icon> <ion-icon class="delete" name="trash-sharp"></ion-icon>
</button> </button>
<!-- <div class="div-icon" (click)="openOptions()"> <!-- <div class="div-icon" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
@@ -51,15 +57,19 @@
<span class="date">{{loadedEvent.Location}}</span> <span class="date">{{loadedEvent.Location}}</span>
<div *ngIf="loadedEvent.Organizer"> <div *ngIf="loadedEvent.Organizer">
<div *ngIf="eventsService.isMyEvent(loadedEvent) == false || sesseionStora.user.Profile =='PR'"> <div *ngIf="eventsService.isMyEvent(loadedEvent) == false || sesseionStora.user.Profile =='PR'">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span> <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span> style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' "
style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
</div> </div>
<div *ngIf="eventsService.isMyEvent(loadedEvent) == true && sesseionStora.user.Profile !='PR'"> <div *ngIf="eventsService.isMyEvent(loadedEvent) == true && sesseionStora.user.Profile !='PR'">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span> <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span> style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' "
style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
</div> </div>
</div> </div>
@@ -67,14 +77,16 @@
<div class="content-details"> <div class="content-details">
<ion-label> <ion-label>
<p>{{customDate}}</p> <p>{{customDate}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p> <p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p> {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate |
date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p>
<p *ngIf="loadedEvent.EventRecurrence"> <p *ngIf="loadedEvent.EventRecurrence">
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span> <span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span> <span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span> <span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span> <span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span> <span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>
</p> </p>
</ion-label> </ion-label>
@@ -104,7 +116,8 @@
<div *ngIf="loadedEvent.Attachments" class="bottom-content width-100"> <div *ngIf="loadedEvent.Attachments" class="bottom-content width-100">
<h5 class="font-17-rem">Documentos Anexados</h5> <h5 class="font-17-rem">Documentos Anexados</h5>
<ion-list class="width-100"> <ion-list class="width-100">
<li *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding pa-0"> <li *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" lines="none"
class="ion-no-margin ion-no-padding pa-0">
<ion-label class="width-100 d-flex align-center"> <ion-label class="width-100 d-flex align-center">
<p class="flex-grow-1 cursor-pointer" (click)="docIndex(i);LoadDocumentDetails()"> <p class="flex-grow-1 cursor-pointer" (click)="docIndex(i);LoadDocumentDetails()">
<span class="attach-title-item d-block">{{attach.SourceName}}</span> <span class="attach-title-item d-block">{{attach.SourceName}}</span>
@@ -116,8 +129,9 @@
</div> </div>
<div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options"> <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
</div> </div>
</ion-label> </ion-label>
@@ -127,4 +141,4 @@
</div> </div>
</ion-content> </ion-content>
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+58 -47
View File
@@ -1,19 +1,25 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> --> <!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Todas as tarefas</ion-label></div> <div class="thetitle"><ion-label>Todas as tarefas</ion-label></div>
<div class="theicon d-flex align-center"> <div class="theicon d-flex align-center">
<div> <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer"> <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex"> <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon> <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem"
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" src='assets/images/icons-search.svg'></ion-icon> src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" src='assets/images/theme/gov/icons-search.svg'></ion-icon> <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem"
src='assets/images/icons-search.svg'></ion-icon>
<ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem"
src='assets/images/theme/gov/icons-search.svg'></ion-icon>
</div> </div>
<button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch"> <button title="Fechar" class="btn-no-color d-flex" (click)="closeSearch();showSearch=false;searchSubject=''"
<ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' " class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon> *ngIf="showSearch">
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' || ThemeService.currentTheme == 'doneIt' "
class="font-35-rem" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" name="restaurant-outline"
src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</button> </button>
<div *ngIf="showSearch"> <div *ngIf="showSearch">
@@ -25,16 +31,16 @@
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()" <ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input> class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div> </div>
<!-- <div class="icon" (click)="clearSearchInput()"> <!-- <div class="icon" (click)="clearSearchInput()">
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon> <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon> <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'doneIt' "name="restaurant-outline" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon> <ion-icon title="Limpar" *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
</div> --> </div> -->
<div (click)="basicSearch()" class="d-flex align-center icon"> <div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
</div> </div>
</div> </div>
</div> </div>
@@ -44,42 +50,43 @@
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<div> <div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
<mat-option value="OverdueTasks"> <mat-option value="OverdueTasks">
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
@@ -90,7 +97,7 @@
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<!-- <!--
<ion-refresher name="refresher" slot="fixed" > <ion-refresher name="refresher" slot="fixed" >
<ion-refresher-content <ion-refresher-content
pullingIcon="chevron-down-circle-outline" pullingIcon="chevron-down-circle-outline"
@@ -103,35 +110,39 @@
<div class="overflow-y-auto height-100 width-100"> <div class="overflow-y-auto height-100 width-100">
<div *ngIf="AllProcess.length >= 0"> <div *ngIf="AllProcess.length >= 0">
<ion-item-sliding class="overflow-y-auto height-100"> <ion-item-sliding class="overflow-y-auto height-100">
<div class="listview"> <div class="listview">
<ion-list *ngIf="AllProcess"> <ion-list *ngIf="AllProcess">
<div <div class="item-hover ion-no-padding cursor-pointer" *ngFor="let task of AllProcess"
class="item-hover ion-no-padding cursor-pointer"
*ngFor = "let task of AllProcess"
(click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)"> (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
<div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)"> <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
<div class="item width-100 " > <div class="item width-100 ">
<div class="item-top-detail"> <div class="item-top-detail">
<div class="item-subject d-flex"> <div class="item-subject d-flex">
<!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} --> <!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label> <ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio || task.Subject ||
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span> task.workflowInstanceDataFields.Subject}}</ion-label>
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)">Nova</span> <span class="dead-line ml-10"
*ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
<span class="new-task ml-10"
*ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)">Nova</span>
</div> </div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon"> <div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty || task.totalDocuments}}</label> <label>{{task.DocumentsQty || task.totalDocuments}}</label>
</div> </div>
</div> </div>
<div class="item-middle-detail"> <div class="item-middle-detail">
<div class="item-remetente"> <div class="item-remetente">
<ion-label class="sender" *ngIf="task.Senders">{{task.Senders }}</ion-label> <ion-label class="sender" *ngIf="task.Senders">{{task.Senders }}</ion-label>
<ion-label class="sender" *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Sender }}</ion-label> <ion-label class="sender" *ngIf="task.workflowInstanceDataFields">{{
task.workflowInstanceDataFields.Sender }}</ion-label>
</div> </div>
</div> </div>
<div *ngIf="task.Agenda" class="item-middle-detail"> <div *ngIf="task.Agenda" class="item-middle-detail">
@@ -141,11 +152,13 @@
</div> </div>
<div *ngIf="task.Agenda" class="item-middle-detail-extra"> <div *ngIf="task.Agenda" class="item-middle-detail-extra">
<div class="item-middle-detail-extra-text"> <div class="item-middle-detail-extra-text">
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'"> <ion-label
*ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
<!-- Agenda {{task.Agenda}} do Presidente da República --> <!-- Agenda {{task.Agenda}} do Presidente da República -->
Agenda {{task.Agenda}} do Titular Agenda {{task.Agenda}} do Titular
</ion-label> </ion-label>
<ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'"> <ion-label
*ngIf=" task.WorkflowName == 'Agenda Oficial MDGPR' || task.WorkflowName == 'Agenda Pessoal MDGPR'">
A sua agenda {{task.Agenda}} A sua agenda {{task.Agenda}}
</ion-label> </ion-label>
</div> </div>
@@ -155,7 +168,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="item-date"> <div class="item-date">
<ion-label>{{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -167,10 +180,8 @@
</ion-item-sliding> </ion-item-sliding>
</div> </div>
<div <div *ngIf="!TaskService.showLoader && AllProcess.length == 0"
*ngIf="!TaskService.showLoader && AllProcess.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+26 -32
View File
@@ -1,36 +1,37 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Diplomas por gerar</ion-label></div> <div class="thetitle"><ion-label>Diplomas por gerar</ion-label></div>
<div class="theicon d-flex align-center"> <div class="theicon d-flex align-center">
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
@@ -40,7 +41,7 @@
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
@@ -54,26 +55,20 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar" </ion-refresher-content>
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-container width-100 overflow-y-auto height-100"> <div class="main-container width-100 overflow-y-auto height-100">
<div *ngIf="diplomasList.length >= 1"> <div *ngIf="diplomasList.length >= 1">
<ion-list > <ion-list>
<div <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of list"
class=" item-hover ion-no-padding ion-no-margin cursor-pointer" (click)="goToDiploma(task.SerialNumber)">
*ngFor = "let task of list"
(click)="goToDiploma(task.SerialNumber)"
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject d-flex"> <div class="subject d-flex">
@@ -82,8 +77,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -97,7 +94,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -106,10 +103,8 @@
</ion-list> </ion-list>
</div> </div>
<div <div *ngIf="!skeletonLoader && diplomasList.length == 0"
*ngIf="!skeletonLoader && diplomasList.length == 0" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -141,5 +136,4 @@
</div> </div>
</ion-content> </ion-content>
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+42 -49
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div> <div class="thetitle"><ion-label>Diplomas</ion-label></div>
<div class="theicon d-flex align-center"> <div class="theicon d-flex align-center">
<!-- <div> <!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer"> <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
@@ -35,44 +35,45 @@
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<div> <div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
<mat-option value="OverdueTasks"> <mat-option value="OverdueTasks">
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
@@ -103,11 +104,8 @@
<div *ngIf="listDiplomasPorValidar.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])"> <div *ngIf="listDiplomasPorValidar.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
<ion-list *ngSwitchCase="'validar'"> <ion-list *ngSwitchCase="'validar'">
<div <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listDiplomasPorValidar"
class=" item-hover ion-no-padding ion-no-margin cursor-pointer" (click)="goToDiploma(task.SerialNumber)">
*ngFor = "let task of listDiplomasPorValidar"
(click)="goToDiploma(task.SerialNumber)"
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject d-flex"> <div class="subject d-flex">
@@ -116,8 +114,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -131,7 +131,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -141,12 +141,8 @@
</div> </div>
<div *ngIf="listDiplomasAssinadosPR.length >= 1"> <div *ngIf="listDiplomasAssinadosPR.length >= 1">
<ion-list *ngSwitchCase="'assinados'"> <ion-list *ngSwitchCase="'assinados'">
<div <div class=" ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listDiplomasAssinadosPR"
class=" ion-no-padding ion-no-margin cursor-pointer" (click)="goToDiploma(task.SerialNumber)">
*ngFor = "let task of listDiplomasAssinadosPR"
(click)="goToDiploma(task.SerialNumber)"
>
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
<div class="exp-top-detail"> <div class="exp-top-detail">
<div class="subject d-flex"> <div class="subject d-flex">
@@ -155,8 +151,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -170,7 +168,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -179,26 +177,22 @@
</div> </div>
<div *ngSwitchCase="'validar'" class="centered-div" > <div *ngSwitchCase="'validar'" class="centered-div">
<div <div *ngIf=" listDiplomasPorValidar.length == 0 && !skeletonLoader"
*ngIf=" listDiplomasPorValidar.length == 0 && !skeletonLoader" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
</div> </div>
<div *ngSwitchCase="'assinados'" class="centered-div"> <div *ngSwitchCase="'assinados'" class="centered-div">
<div <div *ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader"
*ngIf="listDiplomasAssinadosPR.length == 0 && !skeletonLoader" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
</div> </div>
<div *ngSwitchCase="'validar'" > <div *ngSwitchCase="'validar'">
<ion-list *ngIf="skeletonLoader && listDiplomasPorValidar.length == 0"> <ion-list *ngIf="skeletonLoader && listDiplomasPorValidar.length == 0">
<ion-list> <ion-list>
@@ -226,7 +220,7 @@
</ion-list> </ion-list>
</div> </div>
<div *ngSwitchCase="'assinados'" > <div *ngSwitchCase="'assinados'">
<ion-list *ngIf="skeletonLoader && listDiplomasAssinadosPR.length == 0"> <ion-list *ngIf="skeletonLoader && listDiplomasAssinadosPR.length == 0">
<ion-list> <ion-list>
@@ -255,5 +249,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+10 -13
View File
@@ -3,11 +3,8 @@
<div *ngIf="taskList.length >= 1" class="width-100"> <div *ngIf="taskList.length >= 1" class="width-100">
<ion-list part="divo" class="width-100"> <ion-list part="divo" class="width-100">
<div <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer"
class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of taskList; let i = index" (click)="viewTaskDetail.emit(task)">
*ngFor = "let task of taskList; let i = index"
(click)="viewTaskDetail.emit(task)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -18,8 +15,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -33,7 +32,7 @@
<span class="label">{{task.activityInstanceName}}</span> <span class="label">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -41,10 +40,8 @@
</ion-list> </ion-list>
</div> </div>
<div <div *ngIf="!skeletonLoader && taskList.length == 0"
*ngIf="!skeletonLoader && taskList.length == 0" class="empty-list d-flex height-100 width-100 align-center justify-content-center">
class="empty-list d-flex height-100 width-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
@@ -75,4 +72,4 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+48 -57
View File
@@ -1,10 +1,10 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title"> <div class="title">
<div class="thetitle"><ion-label >Pedidos</ion-label></div> <div class="thetitle"><ion-label>Pedidos</ion-label></div>
<div class="theicon btn-refresh d-flex align-center"> <div class="theicon btn-refresh d-flex align-center">
<!-- <div> <!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer"> <div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
<div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex"> <div (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
@@ -35,48 +35,49 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div> <div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg"></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg"></ion-icon>
</div> </div>
</div> </div>
<div> <div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda"> <mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary"
placeholder="Selecione agenda">
<mat-select [(value)]="filterName"> <mat-select [(value)]="filterName">
<mat-option value="Para hoje" > <mat-option value="Para hoje">
Para hoje Para hoje
</mat-option> </mat-option>
<mat-option value="Novos" > <mat-option value="Novos">
Novas Novas
</mat-option> </mat-option>
<mat-option value="Lidos" > <mat-option value="Lidos">
Lidas Lidas
</mat-option> </mat-option>
<mat-option value="Não lidos" > <mat-option value="Não lidos">
Não lidas Não lidas
</mat-option> </mat-option>
<mat-option value="OverdueTasks"> <mat-option value="OverdueTasks">
Em atraso Em atraso
</mat-option> </mat-option>
<mat-option value="Todos" > <mat-option value="Todos">
Todas Todas
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
@@ -98,13 +99,10 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content <ion-refresher-content pullingIcon="chevron-down-circle-outline" pullingText="deslize para actualizar"
pullingIcon="chevron-down-circle-outline" refreshingSpinner="circles" refreshingText="A actualizar...">
pullingText="deslize para actualizar" </ion-refresher-content>
refreshingSpinner="circles" </ion-refresher>
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="main-container width-100 overflow-y-auto height-100 px-20" [ngSwitch]="segment"> <div class="main-container width-100 overflow-y-auto height-100 px-20" [ngSwitch]="segment">
@@ -112,11 +110,8 @@
<ion-list *ngSwitchCase="'parecer'"> <ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of listPedidosParecer; let i = index" <!-- *ngFor = "let task of listPedidosParecer; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" --> (click)="viewExpedientDetail(task.SerialNumber)" -->
<div <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listPedidosParecer"
class=" item-hover ion-no-padding ion-no-margin cursor-pointer" (click)="goToPedido(task.SerialNumber)">
*ngFor = "let task of listPedidosParecer"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" --> <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -127,8 +122,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -142,7 +139,7 @@
<span class="label mr-10">{{task.activityInstanceName}}</span> <span class="label mr-10">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -152,11 +149,8 @@
</div> </div>
<div *ngIf="listPedidosDeferimento.length >= 1"> <div *ngIf="listPedidosDeferimento.length >= 1">
<ion-list *ngSwitchCase="'deferimento'"> <ion-list *ngSwitchCase="'deferimento'">
<div <div class=" item-hover ion-no-padding ion-no-margin cursor-pointer" *ngFor="let task of listPedidosDeferimento"
class=" item-hover ion-no-padding ion-no-margin cursor-pointer" (click)="goToPedido(task.SerialNumber)">
*ngFor = "let task of listPedidosDeferimento"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" --> <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" --> <!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)"> <div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
@@ -167,8 +161,10 @@
<span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span> <span class="new-task ml-10" *ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate)">Nova</span>
</div> </div>
<div class="exp-icon"> <div class="exp-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon> src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' "
src="assets/images/theme/gov/icons-expediente-attachment.svg"></ion-icon>
<label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label> <label *ngIf="task.DocumentsQty != 0">{{task.DocumentsQty}}</label>
</div> </div>
</div> </div>
@@ -182,7 +178,7 @@
<span class="label mr-10">{{task.activityInstanceName}}</span> <span class="label mr-10">{{task.activityInstanceName}}</span>
</div> </div>
<div class="exp-date"> <div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label> <ion-label>{{ task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -190,25 +186,21 @@
</ion-list> </ion-list>
</div> </div>
<div *ngSwitchCase="'parecer'" class="centered-div" > <div *ngSwitchCase="'parecer'" class="centered-div">
<div <div *ngIf=" listPedidosParecer.length == 0 && !skeletonLoader"
*ngIf=" listPedidosParecer.length == 0 && !skeletonLoader" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
</div> </div>
<div *ngSwitchCase="'deferimento'" class="centered-div"> <div *ngSwitchCase="'deferimento'" class="centered-div">
<div <div *ngIf="listPedidosDeferimento.length == 0 && !skeletonLoader"
*ngIf="listPedidosDeferimento.length == 0 && !skeletonLoader" class="empty-list d-flex height-100 align-center justify-content-center">
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span> <span>Lista vazia</span>
</div> </div>
</div> </div>
<div *ngSwitchCase="'deferimento'" > <div *ngSwitchCase="'deferimento'">
<ion-list *ngIf="skeletonLoader && listPedidosDeferimento.length == 0"> <ion-list *ngIf="skeletonLoader && listPedidosDeferimento.length == 0">
<ion-item> <ion-item>
@@ -234,7 +226,7 @@
</ion-list> </ion-list>
</div> </div>
<div *ngSwitchCase="'parecer'" > <div *ngSwitchCase="'parecer'">
<ion-list *ngIf="skeletonLoader && listPedidosParecer.length == 0"> <ion-list *ngIf="skeletonLoader && listPedidosParecer.length == 0">
<ion-item> <ion-item>
@@ -262,5 +254,4 @@
</div> </div>
</ion-content> </ion-content>