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

buttons: save is first, cancel is second

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-23 13:34:03 +01:00
parent 188e1033b8 a06bc4a409
commit 10ca45b8a0
9 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/dar-parecer/dar-parecer.page.html
+1 -1
View File
@@ -56,8 +56,8 @@
</ion-content>
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="cancel()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="save()">Enviar</button>
<button class="btn-cancel" shape="round" (click)="cancel()">Cancelar</button>
</div>
</ion-footer>
src/app/modals/delegar/delegar.page.html
+1 -1
View File
@@ -92,8 +92,8 @@
</ion-content>
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Delegar</button>
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
</div>
</ion-footer>
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+8 -6
View File
@@ -143,12 +143,14 @@ export class DocumentSetUpMeetingPage implements OnInit {
}
if(this.taskParticipants.length == 0) {
this.taskParticipants = [{
EmailAddress: SessionStore.user.Email,
IsRequired: true,
Name: SessionStore.user.FullName,
UserType: "GD"
}]
this.taskParticipants = [
// {
// EmailAddress: SessionStore.user.Email,
// IsRequired: true,
// Name: SessionStore.user.FullName,
// UserType: "GD"
// }
]
}
this.changeAgenda()
src/app/modals/forward/forward.page.html
+2 -1
View File
@@ -77,8 +77,9 @@
</ion-content>
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Adicionar</button>
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
</div>
</ion-footer>
src/app/modals/profile/profile.page.html
+20
View File
@@ -37,6 +37,26 @@
<ion-header class=" bg-blue ion-no-border">
<div class="profile-content">
<div class="d-flex align-center">
<ion-icon *ngIf="SessionStore.user.RoleDescription != 'Presidente da República' && SessionStore.user.RoleDescription != 'Ministro e Director do Gabinete do PR' && SessionStore.user.RoleDescription != 'Secretário Geral' " class="profile-pic"
src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<img *ngIf="SessionStore.user.RoleDescription == 'Presidente da República' " class="profile-pic"
src='assets/images/presidente.png'>
<img *ngIf="SessionStore.user.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-pic"
src='assets/images/ministro.png'>
<img *ngIf="SessionStore.user.RoleDescription == 'Secretário Geral' " class="profile-pic"
src='assets/images/secretaria_geral.png'>
<!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic"
src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="profile-pic"
src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="profile-pic"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon> -->
</div>
<div class="profile-name d-flex justify-content-center width-100">
<ion-label>{{SessionStore.user.FullName}}</ion-label>
</div>
src/app/modals/profile/profile.page.scss
+8
View File
@@ -80,6 +80,14 @@
//color: var(--profile-text-color) !important;
}
.profile-pic{
width: 150px;
height: 150px;
border-radius: 50%;
margin: 0 auto;
border-color: transparent !important;
}
.icon {
font-size: rem(40);
}
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+2 -1
View File
@@ -22,7 +22,8 @@
</ion-content>
<ion-footer class="ion-no-border">
<div class="buttons width-100">
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+8 -6
View File
@@ -154,12 +154,14 @@ export class BookMeetingModalPage implements OnInit {
}
if (this.taskParticipants.length == 0) {
this.taskParticipants = [{
EmailAddress: SessionStore.user.Email,
IsRequired: true,
Name: SessionStore.user.FullName,
UserType: "GD"
}]
this.taskParticipants = [
// {
// EmailAddress: SessionStore.user.Email,
// IsRequired: true,
// Name: SessionStore.user.FullName,
// UserType: "GD"
// }
]
}
this.changeAgenda();
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "578797e01",
"SHA": "578797e0197b3d219921fc73a25f6184c6b67395",
"shortSHA": "188e1033b",
"SHA": "188e1033b8d59e6029218c54edfc506d78e1a960",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Aug 22 15:47:47 2023 +0100'",
"lastCommitMessage": "pul made",
"lastCommitNumber": "5206",
"lastCommitTime": "'Tue Aug 22 17:51:32 2023 +0100'",
"lastCommitMessage": "bug fixed",
"lastCommitNumber": "5208",
"change": "",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 4 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pipes/publication.pipe.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts",
"changeAuthor": "eudes.inacio"
}