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

fix issues

Browse Source
This commit is contained in:
Peter Maquiran
2024-03-02 12:21:00 +01:00
parent e0c75e6d87
commit b1bf06b19e
23 changed files with 131 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+1
View File
@@ -9,6 +9,7 @@
<div style="color: black;">
Evento Pendente de Aprovação
</div>
<!-- List events to approve desktop -->
</div>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+2 -2
View File
@@ -299,7 +299,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2">
<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-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height d-flex cursor-pointer" (click)="addParticipantsCC()">
<div class="list-people flex-grow-1">
@@ -309,7 +309,7 @@
display: grid;
">
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com Conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss
+1
View File
@@ -12,6 +12,7 @@
.main-header{
font-family: Roboto;
background-color: #fff;
min-height: 86px;
overflow:hidden;
transform: translate3d(0, 1px, 0);
src/app/shared/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -155,7 +155,7 @@ export class ViewEventPage implements OnInit {
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText */
this.loadedEvent = res;
console.log('Event details',res)
// console.log('Event details',res)
this.setTimeZone()
this.today = new Date(res.StartDate);
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+2 -2
View File
@@ -241,13 +241,13 @@
<div class="container-div width-100" >
<div class="ion-item-class-2">
<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-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com Conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss
+1 -1
View File
@@ -13,7 +13,7 @@
margin-bottom: 20px;
font-family: Roboto;
background-color: #fff;
min-height: 79px;
min-height: 86px;
overflow:hidden;
transform: translate3d(0, 1px, 0);
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+6 -6
View File
@@ -1,5 +1,5 @@
<ion-header *ngIf="task" class="ion-no-border ">
<div *ngIf="dropButton" class="main-header mt-30 px-20">
<div [ngClass]="{'d-item': !dropButton}" class="main-header mt-30 px-20">
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack.emit()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
@@ -28,7 +28,7 @@
</div>
<div class=" flex-1 d-flex flex-column height-100 d-flex overflow-y-auto-desktop" >
<div *ngIf="dropButton" class="upper-content" >
<div [ngClass]="{'d-item': !dropButton}" class="upper-content" >
<div class="content-details">
<div class="mobile-header">
<ion-label>
@@ -44,7 +44,7 @@
</ion-label>
</div>
</div>
<div *ngIf="dropButton" class="line mx-20"></div>
<div [ngClass]="{'d-item': !dropButton}" class="line mx-20"></div>
<div style="
display: flex;
@@ -52,7 +52,7 @@
height: 100%;
flex-grow: 1;
" class="overflow-y-auto-desktop">
<div class="middle-content" *ngIf="dropButton">
<div class="middle-content" [ngClass]="{'d-item': !dropButton}">
<h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
@@ -123,12 +123,12 @@
<div style="border-radius: 50px;position: relative;top: 3px;left: 25px;">
<ion-row class="timeline-date align-center pr-10 visionMobile-flex" >
<button class="no-color" *ngIf="dropButton" (click)="dropButton=!dropButton" >
<button class="no-color" [ngClass]="{'d-item': !dropButton}" (click)="changeDropButton()" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
</button>
<button class="no-color visionMobile-flex" *ngIf="!dropButton" (click)="dropButton=!dropButton">
<button class="no-color visionMobile-flex" *ngIf="!dropButton" (click)="changeDropButton()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts
+8 -2
View File
@@ -7,6 +7,7 @@ import { PermissionService } from 'src/app/services/permission.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { ModalController } from '@ionic/angular';
import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
import { HeaderSettingsService } from "src/app/services/header-settings.service"
@Component({
selector: 'app-task-details',
@@ -33,7 +34,8 @@ export class TaskDetailsPage implements OnInit {
public DeviceService: DeviceService,
private DocumentViewerOptionService: DocumentViewerOptionService,
public p: PermissionService,
private modalController: ModalController
private modalController: ModalController,
private HeaderSettingsService: HeaderSettingsService
) {
this.DeviceService.isDesktop();
}
@@ -120,7 +122,7 @@ export class TaskDetailsPage implements OnInit {
backdropDismiss: false
});
modal.onDidDismiss().then(res=>{
modal.onDidDismiss().then(res => {
//this.RouteService.goBack();
}, (error) => {
console.log(error)
@@ -129,4 +131,8 @@ export class TaskDetailsPage implements OnInit {
await modal.present();
}
changeDropButton() {
this.dropButton = !this.dropButton;
this.HeaderSettingsService.hideHeader = !this.dropButton
}
}
src/app/shared/header/header.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="header-container header-fix">
<div class="header-container header-fix" [ngClass]="{'d-none-header':HeaderSettingsService.hideHeader}" >
<div class="main-tab pb-10 ion-toolbar header-color">
<div class="mobile pt-20 d-flex div-top-header justify-space-between">
src/app/shared/header/header.page.scss
+2
View File
@@ -177,3 +177,5 @@
.tab {
color: var(--header-tab-text-white);
}
src/app/shared/header/header.page.ts
+3 -1
View File
@@ -16,6 +16,7 @@ import { ActiveTabService } from 'src/app/services/active-tab.service';
import { NotificationsService } from 'src/app/services/notifications.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { NotificationHolderService } from 'src/app/store/notification-holder.service';
import { HeaderSettingsService } from "src/app/services/header-settings.service"
@Component({
selector: 'app-header',
@@ -59,7 +60,8 @@ export class HeaderPage implements OnInit {
private storageService: StorageService,
private zone: NgZone,
private attachmentService: AttachmentsService,
public NotificationHolderService: NotificationHolderService
public NotificationHolderService: NotificationHolderService,
public HeaderSettingsService: HeaderSettingsService
) {
this.loggeduser = SessionStore.user;
router.events.subscribe((val) => {