sf-i-events 1.0.779 → 1.0.780
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dev/index.html +7 -7
- package/package.json +1 -1
- package/sf-i-events.d.ts +1 -1
- package/sf-i-events.js +28 -14
- package/src/sf-i-events.ts +22 -5
- package/dev/Untitled-1.json +0 -4835
- package/dev/Untitled-2.json +0 -38553
package/dev/index.html
CHANGED
|
@@ -638,17 +638,17 @@
|
|
|
638
638
|
</div>
|
|
639
639
|
|
|
640
640
|
</sf-i-events> -->
|
|
641
|
-
<!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="
|
|
641
|
+
<!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Ankur Singhal" userprofileid="010834e8-108e-4a87-b58d-f5b429f184be" projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" projectname="Signode" countryid="4ab8901c-4407-4c4d-a2c7-df1a690aa0a3" myrole="viewer" showregisterexport="false" features="[]" eventfielddependencies="[{"type": "foreignkey", "parent": "country", "child": "state"},{"type": "foreignkey", "parent": "category", "child": "subcategory"},{"type": "foreignkey", "parent": "frequency", "child": "subfrequency"}]" eventfields="[{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/riskarea", "field": "riskarea"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/jurisdiction", "field": "jurisdiction"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/updatetype", "field": "updatetype"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/country", "field": "country"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/specificity", "field": "specificity"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/risk", "field": "risk"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/frequency", "field": "frequency"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/category", "field": "category"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/obligationtype", "field": "obligationtype"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/state", "field": "state"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subfrequency", "field": "subfrequency"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subcategory", "field": "subcategory"},{"type": "sf-i-form", "apiId": "dnytrdlrmxgsy.cloudfront.net/statute", "field": "statute", "projectField": "name"}]" eventpreviewfields="["obligation"]" eventhidefields="["comments","documents","lastupdated","approved","tags"]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
|
|
642
642
|
|
|
643
643
|
<div slot="uploader">
|
|
644
|
-
<sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="["jpg","png","pdf","xls","xlsx","doc","docx"]" extract="yes" projectid="
|
|
644
|
+
<sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="["jpg","png","pdf","xls","xlsx","doc","docx"]" extract="yes" projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" maxsize="5242880" allowdownload="yes"></sf-i-uploader>
|
|
645
645
|
</div>
|
|
646
646
|
<div slot="reporting">
|
|
647
647
|
<sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
|
|
648
648
|
</div>
|
|
649
649
|
|
|
650
650
|
</sf-i-events> -->
|
|
651
|
-
<sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="viewer" showregisterexport="false" features="["notices"]" eventfielddependencies="[{"type": "foreignkey", "parent": "country", "child": "state"},{"type": "foreignkey", "parent": "category", "child": "subcategory"},{"type": "foreignkey", "parent": "frequency", "child": "subfrequency"}]" eventfields="[{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/riskarea", "field": "riskarea"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/jurisdiction", "field": "jurisdiction"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/updatetype", "field": "updatetype"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/country", "field": "country"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/specificity", "field": "specificity"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/risk", "field": "risk"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/frequency", "field": "frequency"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/category", "field": "category"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/obligationtype", "field": "obligationtype"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/state", "field": "state"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subfrequency", "field": "subfrequency"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subcategory", "field": "subcategory"},{"type": "sf-i-form", "apiId": "dnytrdlrmxgsy.cloudfront.net/statute", "field": "statute", "projectField": "name"}]" eventpreviewfields="["obligation"]" eventhidefields="["comments","documents","lastupdated","approved","tags"]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
|
|
651
|
+
<!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="viewer" showregisterexport="false" features="["notices"]" eventfielddependencies="[{"type": "foreignkey", "parent": "country", "child": "state"},{"type": "foreignkey", "parent": "category", "child": "subcategory"},{"type": "foreignkey", "parent": "frequency", "child": "subfrequency"}]" eventfields="[{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/riskarea", "field": "riskarea"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/jurisdiction", "field": "jurisdiction"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/updatetype", "field": "updatetype"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/country", "field": "country"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/specificity", "field": "specificity"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/risk", "field": "risk"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/frequency", "field": "frequency"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/category", "field": "category"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/obligationtype", "field": "obligationtype"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/state", "field": "state"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subfrequency", "field": "subfrequency"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subcategory", "field": "subcategory"},{"type": "sf-i-form", "apiId": "dnytrdlrmxgsy.cloudfront.net/statute", "field": "statute", "projectField": "name"}]" eventpreviewfields="["obligation"]" eventhidefields="["comments","documents","lastupdated","approved","tags"]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
|
|
652
652
|
|
|
653
653
|
<div slot="uploader">
|
|
654
654
|
<sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="["jpg","png","pdf","xls","xlsx","doc","docx"]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader>
|
|
@@ -657,17 +657,17 @@
|
|
|
657
657
|
<sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
|
|
658
658
|
</div>
|
|
659
659
|
|
|
660
|
-
</sf-i-events>
|
|
661
|
-
|
|
660
|
+
</sf-i-events> -->
|
|
661
|
+
<sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="viewer" showregisterexport="false" features="["notices"]" eventfielddependencies="[{"type": "foreignkey", "parent": "country", "child": "state"},{"type": "foreignkey", "parent": "category", "child": "subcategory"},{"type": "foreignkey", "parent": "frequency", "child": "subfrequency"}]" eventfields="[{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/riskarea", "field": "riskarea"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/jurisdiction", "field": "jurisdiction"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/updatetype", "field": "updatetype"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/country", "field": "country"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/specificity", "field": "specificity"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/risk", "field": "risk"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/frequency", "field": "frequency"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/category", "field": "category"},{"type": "sf-i-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/obligationtype", "field": "obligationtype"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/state", "field": "state"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subfrequency", "field": "subfrequency"},{"type": "sf-i-sub-select", "apiId": "dnytrdlrmxgsy.cloudfront.net/subcategory", "field": "subcategory"},{"type": "sf-i-form", "apiId": "dnytrdlrmxgsy.cloudfront.net/statute", "field": "statute", "projectField": "name"}]" eventpreviewfields="["obligation"]" eventhidefields="["comments","documents","lastupdated","approved","tags"]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
|
|
662
662
|
|
|
663
663
|
<div slot="uploader">
|
|
664
|
-
<sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="["jpg","png","pdf","xls","xlsx","doc","docx"]" extract="yes" projectid="
|
|
664
|
+
<sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="["jpg","png","pdf","xls","xlsx","doc","docx"]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader>
|
|
665
665
|
</div>
|
|
666
666
|
<div slot="reporting">
|
|
667
667
|
<sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
|
|
668
668
|
</div>
|
|
669
669
|
|
|
670
|
-
</sf-i-events>
|
|
670
|
+
</sf-i-events>
|
|
671
671
|
<!-- <sf-i-events projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" projectname="Signode" mode="onboarding" locations="{"India":{"Telangana":["Corporate Office","Telangana Plant"],"Karnataka":["Prime","Stopak","Wintek","Tools","Conversion"],"Gujarat":["Dahej"],"Dadra and Nagar Haveli and Daman and Diu":["Silvassa"],"Uttarakhand":["Uttarakhand"],"Maharashtra":["Pune"],"Andhra Pradesh":["AP"],"Chhattisgarh":["Chhattisgarh"],"Goa":["Goa"],"Himachal Pradesh":["HP"],"Haryana":["Haryana"],"Jharkhand":["Jharkhand"],"Madhya Pradesh":["MP"],"Odisha":["Odisha"],"Punjab":["Punjab"],"Tamil Nadu":["TN"],"Uttar Pradesh":["UP"],"West Bengal":["WB"]}}" contractstartdate="01/04/2024" apiid="dwqyez2puoxmu.cloudfront.net/event" username="ninad.t@flagggrc.tech" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidusers="dnytrdlrmxgsy.cloudfront.net/userprofile" disablesignoff="yes" disableclientresponse="yes">
|
|
672
672
|
|
|
673
673
|
</sf-i-events> -->
|
package/package.json
CHANGED
package/sf-i-events.d.ts
CHANGED
|
@@ -462,7 +462,7 @@ export declare class SfIEvents extends LitElement {
|
|
|
462
462
|
renderCalendarEventSummary: () => string;
|
|
463
463
|
renderCalendarEventSummaryViewer: () => string;
|
|
464
464
|
renderStatisticsFiltersTableStart: () => string;
|
|
465
|
-
renderStatisticsFiltersTableRow: () => string;
|
|
465
|
+
renderStatisticsFiltersTableRow: (filterUser?: boolean) => string;
|
|
466
466
|
renderStatisticsFiltersTableEnd: () => string;
|
|
467
467
|
getCalendarRowHide: (events: any, i: number, lastDay: number, month: number, firstDate?: any, currDate?: any) => boolean;
|
|
468
468
|
renderCalendarRowDivStart: (i: number, firstDate?: any, ddmm?: string) => string;
|
package/sf-i-events.js
CHANGED
|
@@ -2294,10 +2294,14 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2294
2294
|
html += '<table id="statistics-table" part="statistics-table" class="statistics-table w-100"><tbody>';
|
|
2295
2295
|
return html;
|
|
2296
2296
|
};
|
|
2297
|
-
this.renderStatisticsFiltersTableRow = () => {
|
|
2297
|
+
this.renderStatisticsFiltersTableRow = (filterUser = false) => {
|
|
2298
2298
|
var html = '';
|
|
2299
2299
|
html += '<tr class="tablerow">';
|
|
2300
|
-
html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">FILTER_CRITERIA_NAME</div><div>DASHBOARD_FILTER_NAME</div
|
|
2300
|
+
html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">FILTER_CRITERIA_NAME</div><div>DASHBOARD_FILTER_NAME</div>';
|
|
2301
|
+
if (filterUser) {
|
|
2302
|
+
html += '<div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Access</div><div>DASHBOARD_LAST_ACTIVE</div><div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Action</div><div>DASHBOARD_LAST_ACTION</div>';
|
|
2303
|
+
}
|
|
2304
|
+
html += '</div></td>';
|
|
2301
2305
|
html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-icons color-not-started">schedule</span> Not Started</div><div>DASHBOARD_NOT_STARTED</div></div></td>';
|
|
2302
2306
|
html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-pending">pending</span> Pending Approval</div><div>DASHBOARD_PENDING_APPROVAL</div></div></td>';
|
|
2303
2307
|
html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-rejected">block</span> Rejected</div><div>DASHBOARD_REJECTED</div></div></td>';
|
|
@@ -2847,7 +2851,7 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2847
2851
|
return html;
|
|
2848
2852
|
};
|
|
2849
2853
|
this.renderStatistics = (_firstDay, _endDay, iInit, iLast, showGraph, index, month, period, firstDate = null, parametersTitle) => {
|
|
2850
|
-
var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
2854
|
+
var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
|
|
2851
2855
|
var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0;
|
|
2852
2856
|
let subfiltersTotal = {};
|
|
2853
2857
|
let subfiltersNotStarted = {};
|
|
@@ -2887,9 +2891,9 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2887
2891
|
// hide = this.getCalendarRowHide(this.events[mmdd], i, lastDay, month, firstDate, currDate);
|
|
2888
2892
|
// }
|
|
2889
2893
|
if (this.statistics[mmdd] != null) {
|
|
2890
|
-
console.log('mmdd', mmdd, this.statistics[mmdd]['approved']);
|
|
2891
2894
|
// html += this.renderCalendarRowDivStart(i, firstDate, mmdd.split("/")[1] + "/" + mmdd.split("/")[0]);
|
|
2892
2895
|
total += this.statistics[mmdd].count;
|
|
2896
|
+
console.log('mmdd', mmdd, this.statistics[mmdd].count, total);
|
|
2893
2897
|
notStarted += (_a = this.statistics[mmdd]["not-started"]) !== null && _a !== void 0 ? _a : 0;
|
|
2894
2898
|
pendingApproval += (_b = this.statistics[mmdd]["pending-approval"]) !== null && _b !== void 0 ? _b : 0;
|
|
2895
2899
|
rejected += (_c = this.statistics[mmdd]["rejected"]) !== null && _c !== void 0 ? _c : 0;
|
|
@@ -2927,6 +2931,8 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2927
2931
|
let filtername = filterval.split(';')[0];
|
|
2928
2932
|
let filterid = filterval.split(';')[1];
|
|
2929
2933
|
let filterTotal = 0, filterNotStarted = 0, filterPendingApproval = 0, filterRejected = 0, filterApproved = 0;
|
|
2934
|
+
let lastActive = "";
|
|
2935
|
+
let lastAction = "";
|
|
2930
2936
|
let subfiltersFilterTotal = {};
|
|
2931
2937
|
let subfiltersFilterNotStarted = {};
|
|
2932
2938
|
let subfiltersFilterPendingApproval = {};
|
|
@@ -2943,12 +2949,16 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2943
2949
|
mmdd = ("0" + (currDate.getMonth() + 1)).slice(-2) + "/" + ("0" + currDate.getDate()).slice(-2);
|
|
2944
2950
|
}
|
|
2945
2951
|
if (this.statisticsFiltersData[filtercriteria][filterid] != null) {
|
|
2952
|
+
if (this.statisticsFiltersData[filtercriteria][filterid]['lasttime'] != null) {
|
|
2953
|
+
lastAction = (_l = this.statisticsFiltersData[filtercriteria][filterid]['lasttime']['lastaction']) !== null && _l !== void 0 ? _l : "";
|
|
2954
|
+
lastActive = (_m = this.statisticsFiltersData[filtercriteria][filterid]['lasttime']['lastactive']) !== null && _m !== void 0 ? _m : "";
|
|
2955
|
+
}
|
|
2946
2956
|
if (this.statisticsFiltersData[filtercriteria][filterid][mmdd] != null) {
|
|
2947
2957
|
filterTotal += this.statisticsFiltersData[filtercriteria][filterid][mmdd].count;
|
|
2948
|
-
filterNotStarted += (
|
|
2949
|
-
filterPendingApproval += (
|
|
2950
|
-
filterRejected += (
|
|
2951
|
-
filterApproved += (
|
|
2958
|
+
filterNotStarted += (_o = this.statisticsFiltersData[filtercriteria][filterid][mmdd]['not-started']) !== null && _o !== void 0 ? _o : 0;
|
|
2959
|
+
filterPendingApproval += (_p = this.statisticsFiltersData[filtercriteria][filterid][mmdd]['pending-approval']) !== null && _p !== void 0 ? _p : 0;
|
|
2960
|
+
filterRejected += (_q = this.statisticsFiltersData[filtercriteria][filterid][mmdd]['rejected']) !== null && _q !== void 0 ? _q : 0;
|
|
2961
|
+
filterApproved += (_r = this.statisticsFiltersData[filtercriteria][filterid][mmdd]['approved']) !== null && _r !== void 0 ? _r : 0;
|
|
2952
2962
|
for (let subfilter of Object.keys(this.statisticsFiltersData[filtercriteria][filterid]['subfilters'])) {
|
|
2953
2963
|
if (subfiltersFilterTotal[subfilter] == null) {
|
|
2954
2964
|
subfiltersFilterTotal[subfilter] = 0;
|
|
@@ -2968,16 +2978,16 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
2968
2978
|
if (this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd] != null) {
|
|
2969
2979
|
subfiltersFilterTotal[subfilter] += (this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd].count);
|
|
2970
2980
|
console.log('subfilterTotal', subfiltersFilterTotal);
|
|
2971
|
-
subfiltersFilterNotStarted[subfilter] += ((
|
|
2972
|
-
subfiltersFilterPendingApproval[subfilter] += ((
|
|
2973
|
-
subfiltersFilterRejected[subfilter] += ((
|
|
2974
|
-
subfiltersFilterApproved[subfilter] += ((
|
|
2981
|
+
subfiltersFilterNotStarted[subfilter] += ((_s = this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd]['not-started']) !== null && _s !== void 0 ? _s : 0);
|
|
2982
|
+
subfiltersFilterPendingApproval[subfilter] += ((_t = this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd]['pending-approval']) !== null && _t !== void 0 ? _t : 0);
|
|
2983
|
+
subfiltersFilterRejected[subfilter] += ((_u = this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd]['rejected']) !== null && _u !== void 0 ? _u : 0);
|
|
2984
|
+
subfiltersFilterApproved[subfilter] += ((_v = this.statisticsFiltersData[filtercriteria][filterid]['subfilters'][subfilter][mmdd]['approved']) !== null && _v !== void 0 ? _v : 0);
|
|
2975
2985
|
}
|
|
2976
2986
|
}
|
|
2977
2987
|
}
|
|
2978
2988
|
}
|
|
2979
2989
|
}
|
|
2980
|
-
filtersTableHtml += this.renderStatisticsFiltersTableRow();
|
|
2990
|
+
filtersTableHtml += this.renderStatisticsFiltersTableRow(lastAction != "" || lastActive != "");
|
|
2981
2991
|
if (filterindex % 2 == 0) {
|
|
2982
2992
|
filtersTableHtml = filtersTableHtml.replace(/TD_BODY_CLASS/g, "td-light");
|
|
2983
2993
|
}
|
|
@@ -3004,6 +3014,8 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
3004
3014
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_APPROVED", filterApprovedHtml);
|
|
3005
3015
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_PENDING_APPROVAL", filterPendingApprovalHtml);
|
|
3006
3016
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_REJECTED", filterRejectedHtml);
|
|
3017
|
+
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_LAST_ACTION", lastAction);
|
|
3018
|
+
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_LAST_ACTIVE", lastActive);
|
|
3007
3019
|
}
|
|
3008
3020
|
filtersTableHtml += this.renderStatisticsFiltersTableEnd();
|
|
3009
3021
|
}
|
|
@@ -4909,7 +4921,7 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
4909
4921
|
const radioRisk = eventContainer.querySelector('#radio-risk');
|
|
4910
4922
|
radioRisk === null || radioRisk === void 0 ? void 0 : radioRisk.addEventListener('click', () => {
|
|
4911
4923
|
this.flowGraph = this.FLOW_GRAPH_RISKAREAS;
|
|
4912
|
-
//console.log('setting flow graph to ', this.flowGraph);
|
|
4924
|
+
// console.log('setting flow graph to ', this.flowGraph);
|
|
4913
4925
|
this.renderRangeEvents(new Date(valueStart), (new Date(valueEnd).getTime() - new Date(valueStart).getTime()) / (1000 * 60 * 60 * 24), eventContainer);
|
|
4914
4926
|
this.renderRiskGraph(eventContainer);
|
|
4915
4927
|
this.attachHandlers(eventContainer, valueStart, valueEnd);
|
|
@@ -16428,6 +16440,7 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
16428
16440
|
"approved": approved,
|
|
16429
16441
|
"entityid": entityId,
|
|
16430
16442
|
"locationid": locationId,
|
|
16443
|
+
"userid": this.userProfileId,
|
|
16431
16444
|
"username": this.userName,
|
|
16432
16445
|
"module": module
|
|
16433
16446
|
};
|
|
@@ -16481,6 +16494,7 @@ let SfIEvents = class SfIEvents extends LitElement {
|
|
|
16481
16494
|
"approved": approved,
|
|
16482
16495
|
"entityid": entityId,
|
|
16483
16496
|
"locationid": locationId,
|
|
16497
|
+
"userid": this.userProfileId,
|
|
16484
16498
|
"username": this.userName,
|
|
16485
16499
|
"module": module
|
|
16486
16500
|
};
|
package/src/sf-i-events.ts
CHANGED
|
@@ -4440,11 +4440,15 @@ export class SfIEvents extends LitElement {
|
|
|
4440
4440
|
|
|
4441
4441
|
}
|
|
4442
4442
|
|
|
4443
|
-
renderStatisticsFiltersTableRow = () => {
|
|
4443
|
+
renderStatisticsFiltersTableRow = (filterUser: boolean = false) => {
|
|
4444
4444
|
|
|
4445
4445
|
var html = '';
|
|
4446
4446
|
html += '<tr class="tablerow">'
|
|
4447
|
-
html +='<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">FILTER_CRITERIA_NAME</div><div>DASHBOARD_FILTER_NAME</div
|
|
4447
|
+
html +='<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">FILTER_CRITERIA_NAME</div><div>DASHBOARD_FILTER_NAME</div>'
|
|
4448
|
+
if(filterUser){
|
|
4449
|
+
html += '<div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Access</div><div>DASHBOARD_LAST_ACTIVE</div><div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Action</div><div>DASHBOARD_LAST_ACTION</div>'
|
|
4450
|
+
}
|
|
4451
|
+
html +='</div></td>'
|
|
4448
4452
|
html +='<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-icons color-not-started">schedule</span> Not Started</div><div>DASHBOARD_NOT_STARTED</div></div></td>'
|
|
4449
4453
|
html +='<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-pending">pending</span> Pending Approval</div><div>DASHBOARD_PENDING_APPROVAL</div></div></td>'
|
|
4450
4454
|
html +='<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-rejected">block</span> Rejected</div><div>DASHBOARD_REJECTED</div></div></td>'
|
|
@@ -5171,9 +5175,10 @@ export class SfIEvents extends LitElement {
|
|
|
5171
5175
|
|
|
5172
5176
|
if(this.statistics[mmdd] != null) {
|
|
5173
5177
|
|
|
5174
|
-
|
|
5178
|
+
|
|
5175
5179
|
// html += this.renderCalendarRowDivStart(i, firstDate, mmdd.split("/")[1] + "/" + mmdd.split("/")[0]);
|
|
5176
5180
|
total += this.statistics[mmdd].count;
|
|
5181
|
+
console.log('mmdd', mmdd, this.statistics[mmdd].count, total);
|
|
5177
5182
|
notStarted += this.statistics[mmdd]["not-started"] ?? 0;
|
|
5178
5183
|
pendingApproval += this.statistics[mmdd]["pending-approval"] ?? 0;
|
|
5179
5184
|
rejected += this.statistics[mmdd]["rejected"] ?? 0;
|
|
@@ -5218,17 +5223,21 @@ export class SfIEvents extends LitElement {
|
|
|
5218
5223
|
}
|
|
5219
5224
|
|
|
5220
5225
|
if(Object.keys(this.statisticsFiltersData).length > 0){
|
|
5226
|
+
|
|
5221
5227
|
let filtercriteria = Object.keys(this.statisticsFiltersData)[0]
|
|
5222
5228
|
let sortedFilters = Util.alphabeticalSort(this.statisticsMeta[filtercriteria])
|
|
5223
5229
|
for(let [filterindex, filterval] of sortedFilters.entries()){
|
|
5224
5230
|
let filtername = filterval.split(';')[0]
|
|
5225
5231
|
let filterid = filterval.split(';')[1]
|
|
5226
5232
|
let filterTotal = 0, filterNotStarted = 0, filterPendingApproval = 0, filterRejected = 0, filterApproved = 0;
|
|
5233
|
+
let lastActive = "";
|
|
5234
|
+
let lastAction = "";
|
|
5227
5235
|
let subfiltersFilterTotal:any = {}
|
|
5228
5236
|
let subfiltersFilterNotStarted:any = {}
|
|
5229
5237
|
let subfiltersFilterPendingApproval:any = {}
|
|
5230
5238
|
let subfiltersFilterRejected:any = {}
|
|
5231
5239
|
let subfiltersFilterApproved:any = {}
|
|
5240
|
+
|
|
5232
5241
|
for(var i = iInit; i <= iLast; i++) {
|
|
5233
5242
|
|
|
5234
5243
|
let mmdd : string = "";
|
|
@@ -5241,6 +5250,10 @@ export class SfIEvents extends LitElement {
|
|
|
5241
5250
|
mmdd = ("0" + (currDate.getMonth()+1)).slice(-2) + "/" + ("0" + currDate.getDate()).slice(-2);
|
|
5242
5251
|
}
|
|
5243
5252
|
if(this.statisticsFiltersData[filtercriteria][filterid] != null){
|
|
5253
|
+
if(this.statisticsFiltersData[filtercriteria][filterid]['lasttime'] != null){
|
|
5254
|
+
lastAction = this.statisticsFiltersData[filtercriteria][filterid]['lasttime']['lastaction'] ?? ""
|
|
5255
|
+
lastActive = this.statisticsFiltersData[filtercriteria][filterid]['lasttime']['lastactive'] ?? ""
|
|
5256
|
+
}
|
|
5244
5257
|
if(this.statisticsFiltersData[filtercriteria][filterid][mmdd] != null){
|
|
5245
5258
|
filterTotal += this.statisticsFiltersData[filtercriteria][filterid][mmdd].count
|
|
5246
5259
|
filterNotStarted += this.statisticsFiltersData[filtercriteria][filterid][mmdd]['not-started'] ?? 0
|
|
@@ -5280,7 +5293,7 @@ export class SfIEvents extends LitElement {
|
|
|
5280
5293
|
}
|
|
5281
5294
|
}
|
|
5282
5295
|
}
|
|
5283
|
-
filtersTableHtml += this.renderStatisticsFiltersTableRow()
|
|
5296
|
+
filtersTableHtml += this.renderStatisticsFiltersTableRow(lastAction != "" || lastActive != "")
|
|
5284
5297
|
if(filterindex % 2 == 0){
|
|
5285
5298
|
filtersTableHtml = filtersTableHtml.replace(/TD_BODY_CLASS/g, "td-light");
|
|
5286
5299
|
}else{
|
|
@@ -5306,6 +5319,8 @@ export class SfIEvents extends LitElement {
|
|
|
5306
5319
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_APPROVED", filterApprovedHtml);
|
|
5307
5320
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_PENDING_APPROVAL", filterPendingApprovalHtml);
|
|
5308
5321
|
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_REJECTED", filterRejectedHtml);
|
|
5322
|
+
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_LAST_ACTION", lastAction);
|
|
5323
|
+
filtersTableHtml = filtersTableHtml.replace("DASHBOARD_LAST_ACTIVE", lastActive);
|
|
5309
5324
|
}
|
|
5310
5325
|
filtersTableHtml += this.renderStatisticsFiltersTableEnd()
|
|
5311
5326
|
}
|
|
@@ -7506,7 +7521,7 @@ export class SfIEvents extends LitElement {
|
|
|
7506
7521
|
radioRisk?.addEventListener('click', () => {
|
|
7507
7522
|
|
|
7508
7523
|
this.flowGraph = this.FLOW_GRAPH_RISKAREAS;
|
|
7509
|
-
//console.log('setting flow graph to ', this.flowGraph);
|
|
7524
|
+
// console.log('setting flow graph to ', this.flowGraph);
|
|
7510
7525
|
this.renderRangeEvents(new Date(valueStart), (new Date(valueEnd).getTime() - new Date(valueStart).getTime())/(1000*60*60*24), eventContainer);
|
|
7511
7526
|
this.renderRiskGraph(eventContainer)
|
|
7512
7527
|
this.attachHandlers(eventContainer, valueStart, valueEnd);
|
|
@@ -21921,6 +21936,7 @@ export class SfIEvents extends LitElement {
|
|
|
21921
21936
|
"approved": approved,
|
|
21922
21937
|
"entityid": entityId,
|
|
21923
21938
|
"locationid": locationId,
|
|
21939
|
+
"userid": this.userProfileId,
|
|
21924
21940
|
"username": this.userName,
|
|
21925
21941
|
"module" : module
|
|
21926
21942
|
}
|
|
@@ -21979,6 +21995,7 @@ export class SfIEvents extends LitElement {
|
|
|
21979
21995
|
"approved": approved,
|
|
21980
21996
|
"entityid": entityId,
|
|
21981
21997
|
"locationid": locationId,
|
|
21998
|
+
"userid": this.userProfileId,
|
|
21982
21999
|
"username": this.userName,
|
|
21983
22000
|
"module" : module
|
|
21984
22001
|
}
|