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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-10-26 15:21:15 +01:00
parent e625853aff
commit 295635fa17
7 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/attendees/attendees.page.html
+12 -4
View File
@@ -14,14 +14,18 @@
<div *ngFor="let attendee of contacts;"> <div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *ngIf="filterSearchList(attendee)" > <ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *ngIf="filterSearchList(attendee)" >
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p> <p>{{ attendee.EmailAddress }}</p>
</ion-label> </ion-label>
<div> <div>
<ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-add-25.svg" ></ion-icon>
</div> </div>
</ion-item> </ion-item>
</div> </div>
@@ -35,7 +39,8 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex"> <ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
@@ -53,7 +58,10 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex"> <ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
src/app/pages/events/attendees/attendees.page.ts
+3 -1
View File
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { ModalController, NavParams } from '@ionic/angular'; import { ModalController, NavParams } from '@ionic/angular';
import { ContactsService } from 'src/app/services/contacts.service'; import { ContactsService } from 'src/app/services/contacts.service';
import { ThemeService } from 'src/app/services/theme.service'
@Component({ @Component({
selector: 'app-attendees', selector: 'app-attendees',
@@ -25,7 +26,8 @@ export class AttendeesPageModal implements OnInit {
private modalCtrl: ModalController, private modalCtrl: ModalController,
private contactsService: ContactsService, private contactsService: ContactsService,
private navParams: NavParams, private navParams: NavParams,
private modalController: ModalController) { private modalController: ModalController,
public ThemeService: ThemeService) {
this.adding = this.navParams.get('adding'); this.adding = this.navParams.get('adding');
this.taskParticipants = this.navParams.get('taskParticipants'); this.taskParticipants = this.navParams.get('taskParticipants');
src/app/services/events/attendees/attendees.page.html
+6 -3
View File
@@ -14,7 +14,8 @@
<div *ngFor="let attendee of contacts;"> <div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *ngIf="filterSearchList(attendee)" > <ion-item (click)="selectContact(attendee)" class="cursor-pointer" lines="none" *ngIf="filterSearchList(attendee)" >
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
@@ -35,7 +36,8 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex"> <ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
@@ -53,7 +55,8 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex"> <ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
src/app/shared/event/attendee-modal/attendee-modal.page.html
+9 -5
View File
@@ -14,14 +14,16 @@
<div *ngFor="let attendee of contacts;"> <div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" class="cursor-pointer" *ngIf="filterSearchList(attendee)" > <ion-item (click)="selectContact(attendee)" class="cursor-pointer" *ngIf="filterSearchList(attendee)" >
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p> <p>{{ attendee.EmailAddress }}</p>
</ion-label> </ion-label>
<div > <div>
<ion-icon class="font-35" src="assets/images/icons-add-25.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-add-25.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-add-25.svg" ></ion-icon>
</div> </div>
</ion-item> </ion-item>
</div> </div>
@@ -35,7 +37,8 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item *ngFor="let attendee of LtaskParticipants;" class="d-flex"> <ion-item *ngFor="let attendee of LtaskParticipants;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
@@ -53,7 +56,8 @@
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item *ngFor="let attendee of LtaskParticipantsCc;" class="d-flex"> <ion-item *ngFor="let attendee of LtaskParticipantsCc;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
</div> </div>
<ion-label> <ion-label>
<h3>{{ attendee.Name }}</h3> <h3>{{ attendee.Name }}</h3>
src/app/shared/event/attendee-modal/attendee-modal.page.ts
+3 -1
View File
@@ -3,6 +3,7 @@ import { ModalController } from '@ionic/angular';
import { ContactsService } from 'src/app/services/contacts.service'; import { ContactsService } from 'src/app/services/contacts.service';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { ThemeService } from 'src/app/services/theme.service'
@Component({ @Component({
selector: 'app-attendee-modal', selector: 'app-attendee-modal',
@@ -34,7 +35,8 @@ export class AttendeePage implements OnInit {
constructor( constructor(
private modalCtrl: ModalController, private modalCtrl: ModalController,
private contactsService: ContactsService ) { private contactsService: ContactsService,
public ThemeService: ThemeService ) {
this.LtaskParticipants = removeDuplicate(this.taskParticipants); this.LtaskParticipants = removeDuplicate(this.taskParticipants);
this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc); this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc);
src/assets/images/theme/gov/icons-add-25.svg
+4
View File
@@ -0,0 +1,4 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M18.0007 12.0002L8.00077 12.0002" stroke="#C63527" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M13 7V17" stroke="#C63527" stroke-width="2" stroke-linecap="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 307 B

src/theme/variables.scss
+2
View File
@@ -520,6 +520,7 @@ $app-theme: mat-light-theme(
background-color: #42b9fe; background-color: #42b9fe;
color: #ffffff !important; color: #ffffff !important;
} }
.btn-delete { .btn-delete {
display: block; display: block;
width: 170px !important; width: 170px !important;
@@ -530,6 +531,7 @@ $app-theme: mat-light-theme(
background-color: #ffe0e0; background-color: #ffe0e0;
color: #d30a0a !important; color: #d30a0a !important;
} }
.btn-cancel { .btn-cancel {
display: block; display: block;
width: 170px !important; width: 170px !important;