-
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index d132333af..070c98772 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -263,6 +263,7 @@ export class DespachosPrOptionsPage implements OnInit {
else if(actionName == 'Concluido') {
await this.concluir(res.data.note, docs);
}
+
this.goBack();
}
});
diff --git a/src/global.scss b/src/global.scss
index 2dbcd3bc1..36f1f07f1 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1340,12 +1340,19 @@ ngx-mat-datetime-content{
.ldio-rpinwye8j0b div { box-sizing: content-box; }
.transparent-modal {
+<<<<<<< HEAD
--background: #f1eaeae7;
--margin: 0;
--padding: 0;
ion-content {
--background:#f1f0ebe7;
+=======
+ --background: #000000;
+
+ ion-content {
+ --background:#2e2121;
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
}
}
@@ -1357,12 +1364,8 @@ ngx-mat-datetime-content{
.transparentblack-modal{
--background: #000000e7;
- ion-content {
- --background:transparent;
-
- }
.transparent-modal .modal-wrapper {
- --background: rgba(8, 8, 8, 0.7);
+ --background: rgb(44, 39, 45);
}
}
diff --git a/src/style/main.scss b/src/style/main.scss
index 87e671c4b..bb7430d66 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -770,6 +770,17 @@
color: black;
}
+.header-color {
+ color: white;
+}
+
+.init-event-header {
+ color: white;
+ background: linear-gradient(270deg, var(--color2) 100%, var(--color3) 100%, var(--color4) 100%, var(--color5) 100%) !important;
+}
+
+
+
.background-blue {
background-color: #0d89d1;
}
{{customDate}}
+<<<<<<< HEAD
+=======
+
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index d075c390e..01681f05f 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -69,6 +69,7 @@ export class ViewPublicationsPage implements OnInit {
this.folderId = this.folderId['ProcessId']
}
+<<<<<<< HEAD
if (typeof (this.id) == 'object') {
this.id = this.id['ProcessId']
@@ -78,11 +79,17 @@ export class ViewPublicationsPage implements OnInit {
setTimeout(() => {
this.testForkJoin()
// this.getPublications();
+=======
+ this.getPublicationsIds()
+ this.getPublicationDetail();
+ setTimeout(() => {
+ this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
}, 1000);
- this.backgroundservice.registerBackService('Online',() => {
+ this.backgroundservice.registerBackService('Online', () => {
this.getPublicationDetail();
- this.getPublications();
+ this.getPublicationsIds();
})
@@ -99,15 +106,23 @@ export class ViewPublicationsPage implements OnInit {
// }
this.testForkJoin()
this.getPublicationDetail();
+<<<<<<< HEAD
// this.getPublications();
+=======
+ this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
}
doRefresh = (event) => {
setTimeout(() => {
this.testForkJoin()
this.getPublicationDetail();
+<<<<<<< HEAD
// this.getPublications();
+=======
+ this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
event.target.complete();
}, 3000);
@@ -146,6 +161,7 @@ export class ViewPublicationsPage implements OnInit {
this.publicationList = new Array();
+<<<<<<< HEAD
res.forEach(element => {
console.log('getPublications', element)
let item: Publication = this.publicationPipe.itemList(element)
@@ -171,6 +187,59 @@ export class ViewPublicationsPage implements OnInit {
});
}
// goes to fork
+=======
+ getPublicationsIds() {
+
+ this.showLoader = true;
+ const folderId = this.folderId
+
+ this.publications.GetPublicationsID(this.folderId).subscribe(res => {
+
+ console.log('publications ids', res)
+ this.publicationList = new Array();
+
+ for(let i of res) {
+ this.publications.GetPublicationById(i).subscribe(ress => {
+ console.log('publications by ids', ress)
+ let item: Publication = this.publicationPipe.itemList(ress)
+ console.log('publications by ids 2', item)
+ this.publicationList.push(item);
+ })
+ }
+
+ /* res.forEach(element => {
+ console.log('publications elements', element)
+ this.publications.GetPublicationById(element).subscribe(ress => {
+ console.log('publications by ids', ress)
+ let item: Publication = this.publicationPipe.itemList(ress)
+ console.log('publications by ids 2', item)
+ this.publicationList.push(ress);
+ })
+
+ }); */
+
+ this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
+
+ this.publicationListStorage.add(folderId, this.publicationList)
+ this.getpublication = this.publicationList;
+
+ this.showLoader = false;
+
+ /* this.publicationList = new Array();
+
+ res.forEach(element => {
+ console.log('getPublications', element)
+ let item: Publication = this.publicationPipe.itemList(element)
+ this.publicationList.push(item);
+ });
+ this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
+
+ this.publicationListStorage.add(folderId, this.publicationList)
+ this.getpublication = this.publicationList; */
+ });
+ }
+
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
getPublications() {
this.showLoader = true;
@@ -186,6 +255,8 @@ export class ViewPublicationsPage implements OnInit {
console.log('getPublications', element)
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
+ console.log('getPublications 222', item)
+
});
this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
@@ -195,7 +266,7 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = false;
}, (error) => {
- if(error.status == '0') {
+ if (error.status == '0') {
this.getFromDB();
}
if (error.status == '404') {
@@ -285,7 +356,7 @@ export class ViewPublicationsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(() => {
- this.getPublications();
+ this.getPublicationsIds();
});
}
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index c1e6c663c..8070c3a21 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -12,7 +12,7 @@ export class ListBoxService {
){}
- filterProfile(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all') {
+ filterProfile(eventSource: EventListStore[] = [], profile: 'md' | 'pr' | 'all') {
return eventSource.filter((e) => e.profile == profile)
}
@@ -160,14 +160,12 @@ export class ListBoxService {
}
- push(event: any, selectedDate: Date) {
-
- console.log(new Date(event.start).getDate(), selectedDate.getDate(), new Date(event.start).getDate() >= selectedDate.getDate())
+ push(event: any, selectedDate: Date) {
- return new Date(event.start).getMonth() == selectedDate.getMonth() &&
- new Date(event.start).getFullYear() == selectedDate.getFullYear() &&
- new Date(event.start).getDate() >= selectedDate.getDate()
- }
+ return new Date(event.start).getMonth() == selectedDate.getMonth() &&
+ new Date(event.start).getFullYear() == selectedDate.getFullYear() &&
+ new Date(event.start).getDate() >= selectedDate.getDate()
+ }
encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {
diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts
index e1670c200..acd6153ec 100644
--- a/src/app/services/background.service.ts
+++ b/src/app/services/background.service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core';
import { ThemeService } from 'src/app/services/theme.service';
+import { StorageService} from 'src/app/services/storage.service';
@Injectable({
providedIn: 'root'
@@ -13,7 +14,8 @@ export class BackgroundService {
}[] = []
constructor(
- private themeservice: ThemeService
+ private themeservice: ThemeService,
+ private storageservice: StorageService
) { }
online() {
@@ -24,6 +26,7 @@ export class BackgroundService {
document.body.style.setProperty(`--color3`, "#d9d9d9");
document.body.style.setProperty(`--color4`, "#d9d9d9ee");
document.body.style.setProperty(`--color5`, "#ececec");
+ this.storageservice.store('networkCheckStore','online');
} else {
document.body.style.setProperty(`--color`, "#0782C9");
@@ -31,6 +34,7 @@ export class BackgroundService {
document.body.style.setProperty(`--color3`, "#0782C9");
document.body.style.setProperty(`--color4`, "#0782c9f0");
document.body.style.setProperty(`--color5`, "#45BAFF");
+ this.storageservice.store('networkCheckStore','online');
}
this.callBacks.forEach((e) => {
@@ -46,6 +50,7 @@ export class BackgroundService {
document.body.style.setProperty(`--color3`, "#ffb703");
document.body.style.setProperty(`--color4`, "#ffb703");
document.body.style.setProperty(`--color5`, "#ffb703");
+ this.storageservice.store('networkCheckStore','offline');
this.callBacks.forEach((e) => {
if (e.type == 'Offline') {
e.funx()
diff --git a/src/app/services/date.service.ts b/src/app/services/date.service.ts
index 2895fea2d..c1c98e440 100644
--- a/src/app/services/date.service.ts
+++ b/src/app/services/date.service.ts
@@ -7,7 +7,6 @@ export class DateService {
constructor() { }
-
deferenceBetweenDays(start: any, end: any) {
const diffTime = Math.abs(end - start);
return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
diff --git a/src/app/services/functions/object.service.spec.ts b/src/app/services/functions/object.service.spec.ts
new file mode 100644
index 000000000..ed7a3d76a
--- /dev/null
+++ b/src/app/services/functions/object.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ObjectService } from './object.service';
+
+describe('ObjectService', () => {
+ let service: ObjectService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(ObjectService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/functions/object.service.ts b/src/app/services/functions/object.service.ts
new file mode 100644
index 000000000..9b52713c8
--- /dev/null
+++ b/src/app/services/functions/object.service.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ObjectService {
+
+ constructor() { }
+
+
+ deepFind(obj, path) {
+ var paths = path.split('.')
+ , current = obj
+ , i;
+
+ for (i = 0; i < paths.length; ++i) {
+ if (current[paths[i]] == undefined) {
+ return undefined;
+ } else {
+ current = current[paths[i]];
+ }
+ }
+ return current;
+ }
+}
diff --git a/src/app/services/functions/sort.service.ts b/src/app/services/functions/sort.service.ts
index 9d580897b..c248ff958 100644
--- a/src/app/services/functions/sort.service.ts
+++ b/src/app/services/functions/sort.service.ts
@@ -1,11 +1,12 @@
import { Injectable } from '@angular/core';
+import { ObjectService } from './object.service';
@Injectable({
providedIn: 'root'
})
export class SortService {
- constructor() { }
+ constructor(private ObjectService: ObjectService) { }
sortArrayISODate(myArray: any) {
if(myArray.length > 0){
@@ -14,6 +15,7 @@ export class SortService {
});
}
}
+
sortArrayByDate(myArray: any) {
console.log(myArray[0].taskStartDate);
if(myArray.length > 0){
@@ -22,4 +24,15 @@ export class SortService {
});
}
}
+
+ sortDate(array = [], path: string) {
+
+ return array.sort( (a,b)=> {
+
+ return new Date(this.ObjectService.deepFind(b, path)).getTime() -
+ new Date(this.ObjectService.deepFind(a, path)).getTime()
+
+ })
+
+ }
}
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index aa1f17808..2bbea80b7 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -84,7 +84,24 @@ export class PublicationsService {
return this.http.delete
-