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

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-28 16:28:59 +01:00
parent ac805b67ba
commit 9bebc1b8b6
18 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/profile/edit-profile/edit-profile.page.html
+2 -2
View File
@@ -1,6 +1,6 @@
<ion-content class=" bg-blue">
<div class="main-content width-100 overflow-y-auto height-100 header-fix">
<div class="profile-header width-100">
<div class="main-content header-fix width-100 overflow-y-auto height-100">
<div class="profile-header width-100 ">
<div class="div-logo width-40">
<div class="logo-icon">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
src/app/models/beast-orm.ts
+11
View File
@@ -51,24 +51,33 @@ models.register({
models: [MessageModel, DeleteMessageModel, attachments]
})
// // acçoes
// export class ActionModel extends models.Model{
// static $tableName = ''
// ProcessId = models.IntegerField({unique: true})
// Description = models.CharField()
// Detail = models.CharField()
// DateBegin = models.CharField()
// DateEnd = models.CharField()
// ActionType = models.CharField()
// }
// export class PublicationFolderModel extends models.Model{
// static $tableName = ''
// DateBegin = models.CharField()
// Description = models.CharField()
// Detail = models.CharField()
// }
// export class PublicationDetailsModel extends models.Model{
// static $tableName = ''
// DateIndex = models.CharField()
// DocumentId = models.IntegerField({unique: true})
// ProcessId = models.CharField()
@@ -83,6 +92,8 @@ models.register({
// export class WebtrixUserModel extends models.Model {
// static $tableName = ''
// FullName = models.CharField()
// Role = models.CharField()
// }
src/app/pages/chat/messages/messages.page.ts
+1 -1
View File
@@ -423,7 +423,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}],
temporaryData: formData,
attachmentsModelData: {
fileBase64: await this.fileService.blobToBase64(blob),
fileBase64: encodedData,
}
})
src/app/pages/events/events.page.html
+1 -1
View File
@@ -25,7 +25,7 @@
<div class="conteiner-box pt-20 height-100">
<div class="main-content justify-center d-flex height-100">
<div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
<div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
<div class="px-20 pb-20 container-filters">
<p class="time ion-text-left font-18-em">{{customDate}}</p>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+1 -1
View File
@@ -215,7 +215,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+1 -1
View File
@@ -174,7 +174,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+1 -1
View File
@@ -240,7 +240,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+1 -1
View File
@@ -227,7 +227,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+1 -1
View File
@@ -63,7 +63,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+1 -1
View File
@@ -287,7 +287,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.menu-ptions{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+1 -1
View File
@@ -205,7 +205,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.menu-ptions{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+1 -1
View File
@@ -171,7 +171,7 @@ ion-button{
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
display: none !important;
}
.content{
width: 65%;
src/app/pages/inactivity/inactivity.page.scss
-6
View File
@@ -319,12 +319,6 @@ ion-item{
position: relative;
top: 35px;
}
.div-top-header {
position: absolute !important;
top: 0px !important;
}
}
src/app/shared/agenda/edit-event/edit-event.page.ts
+3 -1
View File
@@ -452,7 +452,8 @@ export class EditEventPage implements OnInit {
window['temp.path:/home/agenda/edit-event.component.ts'] = {
postEvent: this._postEvent,
eventBody: this.eventBody,
segment: this.segment
segment: this.segment,
loadedEventAttachments: this.loadedEventAttachments
}
}
@@ -464,6 +465,7 @@ export class EditEventPage implements OnInit {
this._postEvent = restoredData.postEvent
this.eventBody = restoredData.eventBody
this.segment = restoredData.segment
this.loadedEventAttachments = restoredData.loadedEventAttachments
return true;
} else {
src/app/shared/agenda/new-event/new-event.page.ts
+3 -1
View File
@@ -727,7 +727,8 @@ export class NewEventPage implements OnInit {
postEvent: this.postEvent,
eventBody: this.eventBody,
segment: this.segment,
CalendarName: this.CalendarName
CalendarName: this.CalendarName,
documents: this.documents
}
}
@@ -745,6 +746,7 @@ export class NewEventPage implements OnInit {
this.eventBody = restoredData.eventBody
this.segment = restoredData.segment
this.CalendarName = restoredData.CalendarName
this.documents = restoredData.documents
// restore dater for date and hours picker
src/app/shared/chat/messages/messages.page.ts
+1 -1
View File
@@ -442,7 +442,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}],
temporaryData: formData,
attachmentsModelData: {
fileBase64: await this.fileService.blobToBase64(blob),
fileBase64: encodedData,
}
})
src/app/tiny-mce/tiny-mce.page.html
+1 -1
View File
@@ -1,6 +1,6 @@
<div >
<ion-toolbar class="d-flex">
<div class="d-flex align-items-center px-20 pt-20 font-25">
<div class="d-flex align-items-center px-20 pt-20 font-25-rem">
<div class="left cursor-pointer" (click)="close()">
<fa-icon icon="chevron-left" class="menu-icon font-awesome-1"></fa-icon>
</div>