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

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-15 15:17:27 +01:00
parent 20c53993bf
commit 08f51343fa
7 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.scss
-1
View File
@@ -931,7 +931,6 @@ $font-size: rem(15);
margin-left: -100%;
button {
// top: -35px;
position: relative;
color: transparent;
background-color: transparent;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+4
View File
@@ -10,6 +10,10 @@
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio }}</ion-label>
<span class="dead-line ml-10"
*ngIf="TaskService.deadlineIsToday(task.Deadline || task.deadline)">Para hoje</span>
<span class="new-task ml-10"
*ngIf="TaskService.lessThen24Hours(task.TaskReceiveDate || task.taskReceiveDate)">Nova</span>
</div>
<div class="div-icon" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
src/app/pages/publications/new-publication/new-publication.page.html
+1 -1
View File
@@ -48,7 +48,7 @@
</div>
<div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' ) && !capturedImage">
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication && !( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' ) && !capturedImage">
<div class="post-img" *ngIf="publication.FileBase64">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
src/app/services/task.service.ts
-3
View File
@@ -108,9 +108,6 @@ export class TaskService {
return false
}
const deadline = new Date(isoDateString)
const plusOneDeadline = deadline.getDate() + 1
deadline.setDate(plusOneDeadline)
return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy')
}
src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
+3 -3
View File
@@ -1,5 +1,5 @@
<ion-content class="container width-100 header-fix">
<div *ngIf="content == ''" class="buttons">
<ion-content class="container width-100 ">
<div *ngIf="content == ''" class="buttons header-fix">
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -7,7 +7,7 @@
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
</div>
<div *ngIf="content != ''" class="buttons">
<div *ngIf="content != ''" class="buttons header-fix">
<!-- <button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button> -->
<button (click)="saveDraft(Document, content)" class="btn-cancel" shape="round" >Salvar Rascunho</button>
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
src/global.scss
+40 -32
View File
@@ -1144,13 +1144,6 @@ background: rgb(92, 92, 92);
}
// angular material inputs
.mat-form-field-infix, .mat-form-field-wrapper {
padding: 0px !important;
}
.select-calendar {
.mat-form-field-infix {
width: unset !important;
@@ -1472,36 +1465,51 @@ $font-size: rem(15);
width: 100%;
}
// date picker
ngx-mat-datetime-content .actions {
z-index: 1;
position: relative;
top: -66px;
margin-bottom: -44px;
// ngx-mat-datetime-content .actions {
// z-index: 1;
// position: relative;
// top: -66px;
// margin-bottom: -44px;
button {
z-index: 11111111;
}
}
// button {
// z-index: 11111111;
// }
// }
ngx-mat-datetime-content .ngx-mat-timepicker {
z-index: 111;
}
.mat-form-field-underline {
display: none !important;
}
ngx-mat-datetime-content .mat-input-element {
padding: 0px !important;
}
// ngx-mat-datetime-content .ngx-mat-timepicker {
// z-index: 111;
// }
// .mat-form-field-underline {
// display: none !important;
// }
ngx-mat-datetime-content{
.actions {
.mat-button-disabled {
background-color: #ff5a5a59 !important;
}
}
}
// ngx-mat-datetime-content .mat-input-element {
// padding: 0px !important;
// }
// ngx-mat-datetime-content{
// .actions {
// .mat-button-disabled {
// background-color: #ff5a5a59 !important;
// }
// }
// }
// // angular material inputs
// .mat-form-field-infix, .mat-form-field-wrapper {
// padding: 0px !important;
// }
// .mat-form-field-infix input {
// }
pre {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "30aba9b18",
"SHA": "30aba9b182c15ea7321fc807156acacacc2d383e",
"shortSHA": "20c53993b",
"SHA": "20c53993bfe98bcea0e84b80dbede56f84a267a5",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'",
"lastCommitMessage": "improve",
"lastCommitNumber": "5158",
"lastCommitTime": "'Tue Aug 15 12:03:37 2023 +0100'",
"lastCommitMessage": "update",
"lastCommitNumber": "5159",
"change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}