peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +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-05-12 16:18:11 +01:00
parent 2c92ed26cf 7714b75fad
commit 00c36c9df2
17 changed files with 220 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/view-event/view-event.page.html
+5 -5
View File
@@ -1,4 +1,4 @@
<ion-menu autoHide="false" side="end" content-id="main-content" >
<!-- <ion-menu autoHide="false" side="end" content-id="main-content" >
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
@@ -27,7 +27,7 @@
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
</div> -->
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
@@ -107,9 +107,9 @@
<span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
</div>
<ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<div (click)="docIndex(i);openTaskOptions()" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg" ></ion-icon>
</div>
</ion-label>
</ion-item>
src/app/shared/agenda/view-event/view-event.page.ts
+32 -1
View File
@@ -11,6 +11,7 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
import { momentG } from 'src/plugin/momentG';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
@Component({
selector: 'app-view-event',
@@ -188,7 +189,7 @@ export class ViewEventPage implements OnInit {
const doc = this.loadedAttachments[ this.dicIndex];
task = {
const Customtask = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
@@ -218,4 +219,34 @@ export class ViewEventPage implements OnInit {
modal.onDidDismiss();
}
async openTaskOptions() {
const doc = this.loadedAttachments[ this.dicIndex];
let customTask = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: doc.ApplicationId,
FolderID: null,
DocId: doc.SourceId,
Subject: doc.SourceName
},
}
const popover = await this.modalController.create({
component: OptsExpedientePage,
cssClass: 'model aside-modal search-submodal',
componentProps: {
fulltask: customTask,
task: customTask
},
//translucent: true
});
return await popover.present();
}
}
src/app/shared/header-pr/header-pr.page.html
+4
View File
@@ -8,6 +8,10 @@
</div>
<div class="div-profile">
<ion-icon src='assets/images/icons-profile-pr.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</ion-toolbar>
src/app/shared/header-pr/header-pr.page.ts
+9 -1
View File
@@ -1,4 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-header-pr',
@@ -7,9 +9,15 @@ import { Component, OnInit } from '@angular/core';
})
export class HeaderPrPage implements OnInit {
constructor() { }
loggeduser: User;
constructor(authService: AuthService) {
this.loggeduser = authService.ValidatedUser;
}
ngOnInit() {
}
locationPathname(): string {
src/app/shared/header/header.page.html
+4 -4
View File
@@ -12,10 +12,10 @@
</div>
<div class="div-profile">
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
</button>
<button class="btn-no-color" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</button>
</div>
</div>
@@ -81,8 +81,8 @@
</div>
<div class="div-profile justify-end d-flex cursor-pointer" (click)="openProfile()">
<ion-icon class="font-45" *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</div>
src/app/shared/header/header.page.ts
+7 -6
View File
@@ -3,6 +3,8 @@ import { AnimationController, ModalController } from '@ionic/angular';
import { SearchPage } from 'src/app/pages/search/search.page';
import { Router } from '@angular/router';
import { ProfileComponent } from '../headers/header-no-search/profile/profile.component';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
@Component({
selector: 'app-header',
@@ -11,17 +13,16 @@ import { ProfileComponent } from '../headers/header-no-search/profile/profile.co
})
export class HeaderPage implements OnInit {
profile: string = 'mdgpr';
searchSubject: string = '';
showSearch=false;
loggeduser: User;
constructor(
private router: Router,private modalController: ModalController,
private animationController: AnimationController,) {
private animationController: AnimationController,
authService: AuthService) {
window['header'] = (profile:string) => {
this.profile = profile;
}
this.loggeduser = authService.ValidatedUser;
router.events.subscribe((val) => {
src/app/shared/headers/header-no-search/header-no-search.page.html
+4 -2
View File
@@ -10,7 +10,8 @@
</div>
<div class="div-profile" (click)="openProfile()">
<ion-icon class="font-45" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
@@ -56,7 +57,8 @@
</div> -->
<div class="div-profile cursor-pointer" (click)="openProfile()">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
</div>
src/app/shared/headers/header-no-search/header-no-search.page.ts
+9 -1
View File
@@ -4,6 +4,8 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { MenuController } from '@ionic/angular';
import { ProfileComponent } from './profile/profile.component';
import { Router } from '@angular/router';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
@Component({
selector: 'app-header-no-search',
templateUrl: './header-no-search.page.html',
@@ -11,10 +13,16 @@ import { Router } from '@angular/router';
})
export class HeaderNoSearchPage implements OnInit {
loggeduser: User;
constructor(private modalController: ModalController,
private menu: MenuController,
private animationController: AnimationController,
private router: Router) { }
private router: Router,
authService: AuthService) {
this.loggeduser = authService.ValidatedUser;
}
ngOnInit() {
}