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

merge

Browse Source
This commit is contained in:
Lorito Tiago
2023-07-27 13:02:18 +01:00
parent 535b8f852d 16fe3a0e5e
commit ec3ebb3f7f
10 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.scss
+1 -1
View File
@@ -617,7 +617,7 @@ ion-title{
-o-border-radius: 10px;
padding: 10px;
p{
margin-bottom: 5px;
margin-bottom: 0px;
line-height: 15px;
}
span {
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
<div class=" btn-dismiss font-30-rem cursor-pointer d-flex " (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
@@ -11,7 +11,7 @@
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{ task.Folio }}</ion-label>
</div>
<div class="div-icon" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
<div class="div-icon d-flex" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+2 -2
View File
@@ -7,7 +7,7 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;">
<div class="title-content width-100 d-flex justify-between">
<div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
<div class="font-30-rem cursor-pointer d-flex" (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
@@ -16,7 +16,7 @@
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="menu-ptions">
<button class="btn-no-color" (click)="openOptions()">
<button class="btn-no-color d-flex" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+1 -1
View File
@@ -309,6 +309,7 @@ ion-list {
.item-subject {
width: 84%;
float: left;
display: flex;
ion-label {
float: left;
@@ -324,7 +325,6 @@ ion-list {
/* font-size: rem(13); */
margin: 0 !important;
padding: 0 !important;
background-color: white;
ion-icon {
font-size: rem(16);
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header ">
<div class="title-content width-100 d-flex justify-space-between ">
<div class="font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
<div class="font-30-rem cursor-pointer d-flex" (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
@@ -12,7 +12,7 @@
<div class="middle flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<div class="div-icon d-flex">
<div autoHide="false" class="d-flex" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-30-rem cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-30-rem cursor-pointer" src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
-2
View File
@@ -43,9 +43,7 @@
padding-left: 5px;
}
.div-icon{
width: 37px !important;
font-size: rem(35) !important;
padding: 1px;
right: 0 !important;
}
}
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<button class="btn-no-color d-flex" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+1
View File
@@ -58,6 +58,7 @@ ion-list{
.item-subject{
width: 84%;
float: left;
display: flex;
ion-label{
margin: 0 !important;
src/app/shared/publication/new-publication/new-publication.page.ts
+1 -1
View File
@@ -66,7 +66,7 @@ export class NewPublicationPage implements OnInit {
getPublicationDetail() {
this.showLoader = true;
this.publications.GetPublicationById(this.publicationId).subscribe( res =>{
this.publications.GetPublicationById(this.publicationId).subscribe( res => {
this.publication = {
DateIndex: res.DateIndex,
DocumentId: res.DocumentId,
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "9e8bb92b9",
"SHA": "9e8bb92b9661c6ce4fbb415f07891e2cca809137",
"shortSHA": "a08bb5d4f",
"SHA": "a08bb5d4f4fd2f598b3c297a303f863096251ce0",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Jul 25 16:49:51 2023 +0100'",
"lastCommitMessage": "fix issue 27",
"lastCommitNumber": "5110",
"lastCommitTime": "'Wed Jul 26 13:06:42 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5111",
"change": "",
"changeStatus": "On branch developer-catch-merge\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/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/background.service.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tnew file: src/app/shared/publication/new-publication/convertBlobToBase64.worker.js\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts",
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts",
"changeAuthor": "peter.maquiran"
}