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 eye position

Browse Source
This commit is contained in:
Peter Maquiran
2024-02-29 22:47:42 +01:00
parent 3625a91894 839ea57d80
commit f7ff7b733c
13 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.page.ts
+14 -2
View File
@@ -107,8 +107,8 @@ export class EditEventPage implements OnInit {
ngOnInit() {
this._postEvent = this.postEvent
console.log({_postEvent: this._postEvent})
this.postEvent.StartDate = new Date(this.ajustMinuts(this.postEvent.StartDate))
this.postEvent.EndDate = new Date(this.ajustMinuts(this.postEvent.EndDate))
if(!this.restoreTemporaryData()) {
// clear
@@ -584,4 +584,16 @@ export class EditEventPage implements OnInit {
}
ajustMinuts(string) {
var partes = string.split(' ');
var horaMinuto = partes[1].split(':');
if (horaMinuto[1] === '59') {
horaMinuto[1] = '00';
var novaString = partes[0] + ' ' + horaMinuto.join(':');
return novaString;
}
return string;
}
}
src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+1
View File
@@ -331,5 +331,6 @@ ion-button{
.activity-instanceName {
span {
text-wrap: nowrap;
white-space: nowrap;
}
}
src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.html
+3 -3
View File
@@ -2,11 +2,11 @@
<div class="width-100">
<div class="d-flex width-100">
<div class="flex-grow-1 flex-wrap d-flex">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButonText" shape="round">Outras opções </button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page.scss
+6
View File
@@ -64,3 +64,9 @@
background-color: white;
color: var(--profile-text-color);
}
.deskButonText{
text-align: left;
background-color: transparent;
color: var(--profile-text-color);
}
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+3 -3
View File
@@ -8,11 +8,11 @@
<div class="width-100">
<div class="d-flex width-100">
<div class="flex-grow-1 flex-wrap d-flex">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round"> Enviar para o {{ environment.PR}} </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel deskButtonText" shape="round">Outras opções </button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<!-- <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button> -->
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
src/app/shared/popover/opts-expediente/opts-expediente.page.scss
+6
View File
@@ -64,3 +64,9 @@
background-color: white;
color: var(--profile-text-color);
}
.deskButtonText{
text-align: left;
background-color: transparent;
color: var(--profile-text-color);
}
src/app/shared/publication/new-action/new-action.page.ts
+11 -8
View File
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
}
/* get dateValid() {
get dateValid() {
var validado: boolean;
if (window.innerWidth <= 800) {
@@ -86,16 +86,19 @@ export class NewActionPage implements OnInit {
} else {
return ['ok']
}
} */
get dateValid() {
return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null
}
/* get dateValid() {
return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null
} */
runValidation() {
this.validateFrom = true;
if((new Date(this.folder.DateBegin).getTime()) > (new Date(this.folder.DateEnd).getTime())) {
console.log(this.folder.DateBegin)
console.log(this.folder.DateEnd)
if(this.folder.DateBegin > this.folder.DateEnd) {
this.toastService._badRequest("A data de início não pode ser superior a data de fim");
return false
}
}
@@ -117,13 +120,13 @@ export class NewActionPage implements OnInit {
async save() {
alert('hererr')
this.injectValidation()
this.runValidation()
if(this.Form.invalid) return false
alert('hererr 222')
this.folder = {
ProcessId: null,