-
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
+
{{task.taskStartDate | date: 'dd-MM-yy'}}
{{task.taskStartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 546ec76f1..1d21c855d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -165,8 +165,8 @@ export class GabineteDigitalPage implements OnInit {
}
const pathname = window.location.pathname
- this.router.events.forEach((event) => {
- if (event instanceof NavigationEnd && event.url == pathname) {
+ //this.router.events.forEach((event) => {
+ //if (event instanceof NavigationEnd && event.url == pathname) {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
@@ -179,18 +179,18 @@ export class GabineteDigitalPage implements OnInit {
}
}
})
- }
- });
+ //}
+ //});
this.hideRefreshButton();
- this.waitForDomService.selector({
- selector: 'app-gabinete-digital ion-content .aside-wrapper',
- callback: () => {
- // console.log('SECOND CALL')
- this.loadAllProcesses();
- }
- })
+ // this.waitForDomService.selector({
+ // selector: 'app-gabinete-digital ion-content .aside-wrapper',
+ // callback: () => {
+ // // console.log('SECOND CALL')
+ // this.loadAllProcesses();
+ // }
+ // })
this.backgroundservice.registerBackService('Online', () => {
// this.loadAllProcesses();
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 47847ce54..a01dc100a 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -426,7 +426,7 @@ export class SearchPage implements OnInit {
});
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
- ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
+ ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -442,7 +442,7 @@ export class SearchPage implements OnInit {
this.reorderList(this.ordinance);
// hide show document
- if(this.searchDocuments.length >= 1){
+ if(this.searchDocuments.length >= 1) {
this.showDocuments = true;
} else {
this.showDocuments = false
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 35f79dc98..3fd33a44e 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -73,6 +73,7 @@ export class NewEventPage implements OnInit {
@Input() roomId:string;
@Input() selectedSegment: string;
@Input() selectedDate: Date;
+ @Input() CalendarDate: Date;
@Input() taskParticipants: EventPerson[] = [];
@Input() taskParticipantsCc: any = [];
@@ -147,7 +148,7 @@ export class NewEventPage implements OnInit {
}
this.getRecurrenceTypes();
- if(!this.restoreTemporaryData()){
+ if(!this.restoreTemporaryData()) {
// clear
this.eventBody = { BodyType : "1", Text : ""};
this.postEvent.Body = this.eventBody;
@@ -218,11 +219,18 @@ export class NewEventPage implements OnInit {
this.date = new Date(2021,9,4,5,6,7);
this.injectValidation();
+ this.setDefaultTime();
}
- roundTimeQuarterHour() {
- var timeToReturn = new Date();
+ setDefaultTime() {
+ console.log(this.CalendarDate)
+ this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
+ this.postEvent.EndDate = this.postEvent.StartDate;
+ }
+
+ roundTimeQuarterHour(timeToReturn?) {
+ var timeToReturn = timeToReturn || new Date();
// var minutes = timeToReturn.getMinutes();
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
@@ -260,11 +268,11 @@ export class NewEventPage implements OnInit {
}
setStartDate(){
- this.postEvent.StartDate = this.roundTimeQuarterHour();
+ // this.postEvent.StartDate = this.roundTimeQuarterHour();
}
setEndDate(){
- this.postEvent.EndDate = this.postEvent.StartDate;
+ // this.postEvent.EndDate = this.postEvent.StartDate;
}
runValidation() {
@@ -362,7 +370,7 @@ export class NewEventPage implements OnInit {
}
}
- async getDoc(){
+ async getDoc() {
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'modal-width-100-width-background modal',
@@ -373,7 +381,7 @@ export class NewEventPage implements OnInit {
}
});
await modal.present();
- modal.onDidDismiss().then((res)=>{
+ modal.onDidDismiss().then((res) => {
if(res){
const data = res.data;
this.documents.push(data.selected);
@@ -497,12 +505,12 @@ export class NewEventPage implements OnInit {
});
await DocumentToSave.forEach((attachments, i) => {
this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
- if(DocumentToSave.length == (i+1)){
+ if(DocumentToSave.length == (i+1)) {
this.afterSave();
}
});
});
- if(DocumentToSave.length == 0){
+ if(DocumentToSave.length == 0) {
this.afterSave();
}
this.toastService._successMessage('Evento criado');
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index 3798b2ee2..d2b1e2096 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
@@ -15,8 +15,6 @@
-
-
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 2f38ce6cd..6d271bde9 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -51,21 +51,11 @@ export class OptsExpedientePage implements OnInit {
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
) {
- this.loggeduser = SessionStore.user
- this.task = this.navParams.get('task');
- this.fulltask = this.navParams.get('fulltask');
-
- if(this.task.Status != 'Pending') {
- this.showEnviarPendentes = true;
- }
+
}
ngOnInit() {
- window.onresize = (event) => {
- if( window.innerWidth >= 800){
- this.popoverController.dismiss();
- }
- };
+
}
async openNewGroupPage(){
diff --git a/version/git-version.ts b/version/git-version.ts
index 9b9af958e..6e8e6533f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "378ea8fe5",
- "SHA": "378ea8fe5b32dc1a9b68a71b98b32ed1e2e7a5a0",
+ "shortSHA": "47cc0257f",
+ "SHA": "47cc0257f828b4bf00b5497bb71a21143388c73e",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Sun Jan 22 18:48:45 2023 +0100'",
- "lastCommitMessage": "improve",
- "lastCommitNumber": "4678",
+ "lastCommitTime": "'Mon Jan 23 10:00:16 2023 +0100'",
+ "lastCommitMessage": "Select agenda by default",
+ "lastCommitNumber": "4679",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts",
+ "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file