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

fix agenda

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-17 16:40:17 +01:00
parent 955640e42e
commit bd13431c6a
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+15 -2
View File
@@ -257,10 +257,23 @@
<div class="calendar-title-container px-20 d-flex"> <div class="calendar-title-container px-20 d-flex">
<div style="padding-right: 75px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' "> <ion-row class="timeline-date align-center pr-10">
<button class="no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false">
<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" *ngIf="!showCalendar" (click)="calendarHeight='356px';showCalendar=true">
<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>
</button >
</ion-row>
<div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
Todos Todos
</div> </div>
<div style="padding-right: 75px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' "> <div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais Pessoais
</div> </div>
<div class=" text-black align-center cursor-pointer" (click)="changeSegment('Oficial')" [class.active]="segment == 'Oficial' "> <div class=" text-black align-center cursor-pointer" (click)="changeSegment('Oficial')" [class.active]="segment == 'Oficial' ">
src/app/pages/agenda/agenda.page.scss
+11 -1
View File
@@ -402,7 +402,7 @@ td.monthview-primary-with-event {
cursor: pointer; cursor: pointer;
padding: 10px 20px; padding: 10px 20px;
.collaps{ .collaps{
font-size: 26px; font-size: 20px;
padding-right: 8px; padding-right: 8px;
} }
.filter{ .filter{
@@ -995,3 +995,13 @@ $font-size: 11pt;
} }
} }
.no-color {
color: unset !important;
background: unset !important;
ion-icon {
color: unset !important;
}
}
src/app/pages/events/events.page.ts
-1
View File
@@ -83,7 +83,6 @@ export class EventsPage implements OnInit {
public TaskService: TaskService public TaskService: TaskService
) { ) {
// this.TaskService.updateCount()
this.TaskService.LoadTask() this.TaskService.LoadTask()
src/app/pages/gabinete-digital/expediente/expediente.page.html
+2 -2
View File
@@ -11,7 +11,7 @@
<label>Expediente <span class="lowercase" *ngIf="filterName != 'Todos' ">{{ filterName }}</span></label> <label>Expediente <span class="lowercase" *ngIf="filterName != 'Todos' ">{{ filterName }}</span></label>
</div> </div>
<div class="btn-refresh"> <div class="btn-refresh">
<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" >
@@ -41,7 +41,7 @@
</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>
</button> </button>
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "9c835cde2", "shortSHA": "955640e42",
"SHA": "9c835cde286868d69e7585bb06516f10519455fe", "SHA": "955640e42e17fade6bd2f63de39dbed382529913",
"branch": "feature/gabineteLabels", "branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Apr 17 15:13:44 2023 +0100'", "lastCommitTime": "'Mon Apr 17 16:00:30 2023 +0100'",
"lastCommitMessage": "remove button form mobile", "lastCommitMessage": "centralize service",
"lastCommitNumber": "4911", "lastCommitNumber": "4912",
"change": "", "change": "",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts", "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }