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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-23 14:39:56 +01:00
parent baecb40f6b 8f76806ae4
commit f49841a904
36 changed files with 805 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/view-event/view-event.page.html
+51 -1
View File
@@ -1,3 +1,46 @@
<ion-menu autoHide="false" side="end" content-id="main-content" >
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal(task)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="deleteEvent()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item (click)="editEvent()">
<ion-icon name="create-outline" slot="start"></ion-icon>
<ion-label>Editar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header px-20">
@@ -10,14 +53,21 @@
<div class="middle flex-grow-1">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div>
<div class="div-icon">
<div class="div-icon d-none">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button>
<button class="btn-no-color" (click)="deleteEvent()">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
</div>
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div>
</div>
</ion-toolbar>
src/app/shared/agenda/view-event/view-event.page.scss
+1 -1
View File
@@ -6,7 +6,7 @@ ion-content{
font-size: 18px;
}
ion-menu{
--height: 225px;
}
.header-toolbar{
--background:transparent;
src/app/shared/agenda/view-event/view-event.page.ts
+33
View File
@@ -8,6 +8,7 @@ import { Event } from 'src/app/models/event.model';
import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@Component({
selector: 'app-view-event',
@@ -46,6 +47,7 @@ export class ViewEventPage implements OnInit {
public alertController: AlertController,
private iab: InAppBrowser,
private processes: ProcessesService,
private modalController: ModalController,
)
{
this.isEventEdited = false;
@@ -127,4 +129,35 @@ export class ViewEventPage implements OnInit {
});
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']=='openDiscart'){
console.log('open discart');
// this.distartExpedientModal();
}
});
}
}
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+2 -2
View File
@@ -239,7 +239,7 @@ export class GroupContactsPage implements OnInit {
name:this.groupName,
duration:'',
},
cssClass: 'new-group',
cssClass: 'new-group modal-desktop',
backdropDismiss: false,
});
await modal.present();
@@ -299,7 +299,7 @@ export class GroupContactsPage implements OnInit {
this.close();
const modal = await this.modalController.create({
component: NewGroupPage,
cssClass: 'new-group',
cssClass: 'new-group modal-desktop',
backdropDismiss: false,
});
await modal.present();
src/app/shared/chat/group-messages/group-messages.page.ts
+1 -1
View File
@@ -240,7 +240,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
async openOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatPopoverPage,
cssClass: 'chat-popover',
cssClass: 'chat-popover modal-desktop',
event: ev,
componentProps: {
room: this.room,
src/app/shared/header-pr/header-pr.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue">
<ion-toolbar>
<div class="div-top-header">
<div class="div-search">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
src/app/shared/header/header.page.html
+4 -4
View File
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue pb-10">
<div class=" pb-10 ion-toolbar text-white">
<div class="mobile d-flex div-top-header justify-space-between">
@@ -58,10 +58,10 @@
<div class="d-flex">
<div class="mr-10 d-flex align-center">
<button (click)="openSearch()" *ngIf="!showSearch" class="btn-no-color" (click)="showSearch=true">
<button (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="btn-no-color">
<ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
</button>
<button class="btn-no-color" (click)="closeSearch()" *ngIf="showSearch" (click)="showSearch=false">
<button class="btn-no-color" (click)="closeSearch();showSearch=false" *ngIf="showSearch" >
<ion-icon class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
</button>
@@ -89,5 +89,5 @@
</div>
</ion-toolbar>
</div>
src/app/shared/header/header.page.scss
+1 -1
View File
@@ -2,7 +2,7 @@
.div-top-header{
margin: 0 em(20px);
background-color: #0782c9;
// background-color: #0782c9;
padding-top: em(15px);
border: 0!important;
}
src/app/shared/header/header.page.ts
+9 -2
View File
@@ -13,7 +13,7 @@ export class HeaderPage implements OnInit {
profile: string = 'mdgpr';
searchSubject: string = '';
showSearch:false;
showSearch=false;
constructor(
private router: Router,private modalController: ModalController,
@@ -41,9 +41,16 @@ export class HeaderPage implements OnInit {
async openSearch() {
let classs;
if(window.innerWidth < 1366) {
classs = 'modal modal-width-100 modal-padding-top'
} else {
classs = 'modal modal-width-100 modal-padding-top modal-desktop-shadow modal-desktop-remove-background'
}
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
cssClass: classs,
componentProps: {
}
});
src/app/shared/headers/header-no-search/header-no-search.page.html
+2 -2
View File
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue pb-10">
<div class=" pb-10 ion-toolbar text-white">
<div class="mobile d-flex div-top-header justify-space-between">
@@ -64,5 +64,5 @@
</div>
</ion-toolbar>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.scss
+1 -1
View File
@@ -2,7 +2,7 @@
.div-top-header{
margin: 0 em(20px);
background-color: #0782c9;
// background-color: #0782c9;
padding-top: em(15px);
border: 0!important;
}