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

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-16 15:43:15 +01:00
parent c0029364c8 289cb30a6b
commit d44ca806ef
6 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/view-document/view-document.page.ts
-1
View File
@@ -6,7 +6,6 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
import { ProcessesService } from 'src/app/services/processes.service';
import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
import { AlertService } from 'src/app/services/alert.service';
import { AlertController, ModalController } from '@ionic/angular';
@Component({
selector: 'app-view-document',
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+4 -5
View File
@@ -108,7 +108,6 @@ export class BookMeetingModalPage implements OnInit {
emptyTextDescription = "Sem intervenientes selecionados";
CalendarName
CalendarOwnerName = ''
sessionStore = SessionStore;
@@ -352,12 +351,12 @@ export class BookMeetingModalPage implements OnInit {
selectedCalendarId () {
if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
return this.calendarService.calendarNamesType[this.CalendarOwnerName]['OficialId']
if (this.calendarService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
return this.calendarService.calendarNamesType[this.CalendarName]['OficialId']
} else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
} else if (this.calendarService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
return this.calendarService.calendarNamesType[this.CalendarOwnerName]['PessoalId']
return this.calendarService.calendarNamesType[this.CalendarName]['PessoalId']
} else {
return '11:11'
src/app/shared/agenda/view-event/view-event.page.ts
+4 -4
View File
@@ -182,7 +182,7 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
this.toastService.successMessage('Evento apagado');
this.toastService._successMessage('Evento eliminado');
this.close();
},()=>{},
()=>{
@@ -192,7 +192,7 @@ export class ViewEventPage implements OnInit {
if(this.CalendarId) {
this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
this.toastService.successMessage('Evento apagado');
this.toastService._successMessage('Evento eliminado');
this.close();
},()=>{},
()=>{
@@ -208,7 +208,7 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
this.toastService.successMessage('Evento apagado');
this.toastService._successMessage('Evento eliminado');
this.close();
},()=>{},
()=>{
@@ -216,7 +216,7 @@ export class ViewEventPage implements OnInit {
});
} else {
this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
this.toastService.successMessage('Evento apagado');
this.toastService._successMessage('Evento eliminado');
this.close();
},()=>{},
()=>{
src/assets/www/pdfjs/web/viewer.html
+21
View File
@@ -298,6 +298,9 @@
</menu>
<div id="viewerContainer" tabindex="0">
<div id="loader" style="color: white;font-size: 16px;margin-bottom: -100%;top: 50px;position: relative;/* display: none; */margin-bottom: -18px;/* left: 50px; *//* text-align: center; */height: calc(100% - 0px);justify-content: center;align-items: center;display: flex;position: absolute;top: 0px;left: 0px;width: 100%;z-index: 1111111;text-align: center;">
Estamos a preparar a visualização do documento.<br> Por favor aguarde.
</div>
<div id="viewer" class="pdfViewer"></div>
</div>
@@ -407,5 +410,23 @@
</div> <!-- outerContainer -->
<div id="printContainer"></div>
</body>
<script>
function loader() {
let viewerContext = document.getElementById("viewer").innerHTML
viewerContext = viewerContext.replace(" ", "")
if(!viewerContext) {
setTimeout(() => {
loader()
}, 500)
} else {
document.getElementById("loader").remove()
}
}
setTimeout(() => {
loader()
}, 1000)
</script>
</html>