sf-i-events 1.0.823 → 1.0.825

package/dev/index.html

@@ -714,7 +714,7 @@
         </div>
         
     </sf-i-events> -->
-    <!-- <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="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="reporter" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
+    <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="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="reporter" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
 
         <div slot="uploader">
             <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader>
@@ -723,7 +723,7 @@
             <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
         </div>
         
-    </sf-i-events> -->
+    </sf-i-events>
     <!-- <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="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
 
         <div slot="uploader">
@@ -737,7 +737,7 @@
     <!-- <sf-i-events projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" projectname="Signode" mode="onboarding" locations="{&quot;India&quot;:{&quot;Telangana&quot;:[&quot;Corporate Office&quot;,&quot;Telangana Plant&quot;],&quot;Karnataka&quot;:[&quot;Prime&quot;,&quot;Stopak&quot;,&quot;Wintek&quot;,&quot;Tools&quot;,&quot;Conversion&quot;],&quot;Gujarat&quot;:[&quot;Dahej&quot;],&quot;Dadra and Nagar Haveli and Daman and Diu&quot;:[&quot;Silvassa&quot;],&quot;Uttarakhand&quot;:[&quot;Uttarakhand&quot;],&quot;Maharashtra&quot;:[&quot;Pune&quot;],&quot;Andhra Pradesh&quot;:[&quot;AP&quot;],&quot;Chhattisgarh&quot;:[&quot;Chhattisgarh&quot;],&quot;Goa&quot;:[&quot;Goa&quot;],&quot;Himachal Pradesh&quot;:[&quot;HP&quot;],&quot;Haryana&quot;:[&quot;Haryana&quot;],&quot;Jharkhand&quot;:[&quot;Jharkhand&quot;],&quot;Madhya Pradesh&quot;:[&quot;MP&quot;],&quot;Odisha&quot;:[&quot;Odisha&quot;],&quot;Punjab&quot;:[&quot;Punjab&quot;],&quot;Tamil Nadu&quot;:[&quot;TN&quot;],&quot;Uttar Pradesh&quot;:[&quot;UP&quot;],&quot;West Bengal&quot;:[&quot;WB&quot;]}}" 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">
 
     </sf-i-events> -->
-    <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" fill="solid" username="Local Approver 1" userprofileid="c44dcd04-aebb-4417-ba6b-fac170efd5d0" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="approver" showregisterexport="false" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
+    <!-- <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" fill="solid" username="Local Approver 1" userprofileid="c44dcd04-aebb-4417-ba6b-fac170efd5d0" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="approver" showregisterexport="false" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
 
         <div slot="uploader">
             <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader>
@@ -746,7 +746,7 @@
             <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
         </div>
         
-    </sf-i-events>
+    </sf-i-events> -->
     <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" mode="next" fill="solid" username="Sachin Bhat" userprofileid="347e23a2-5ff8-4d3a-b1ab-639faf342f25" projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" projectname="Signode" myroles="[&quot;reporter&quot;]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" blocksize="10" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024"><div slot="uploader"><sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" extract="yes" projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" maxsize="5242880" allowdownload="yes"></sf-i-uploader></div><div slot="reporting"><sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting></div></sf-i-events> -->
     <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" mode="next" fill="solid" username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" myroles="[&quot;reporter&quot;]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" blocksize="10" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024"><div slot="uploader"><sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader></div><div slot="reporting"><sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting></div></sf-i-events> -->
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.823",
+  "version": "1.0.825",
   "description": "Superflows Navigation Component",
   "main": "sf-i-events.js",
   "module": "sf-i-events.js",

package/sf-i-events.d.ts

@@ -716,12 +716,12 @@ export declare class SfIEvents extends LitElement {
     uploadUnTriggerEvent: (untrigger: any) => Promise<void>;
     uploadTriggerMyEvent: (complianceid: string, message: string, countryname: string, entityname: string, locationname: string, statute: string, subcategory: string) => Promise<void>;
     uploadTriggerEvent: (triggeredCompliances: any) => Promise<void>;
-    uploadAudit: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module?: string) => Promise<void>;
+    uploadAudit: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module?: string) => Promise<boolean>;
     uploadAuditsBulk: (bulkBody: any) => Promise<void>;
-    uploadReview: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module?: string) => Promise<void>;
+    uploadReview: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module?: string) => Promise<boolean>;
     uploadReportsReviewsBulk: (bulkBody: any) => Promise<void>;
     uploadReviewsBulk: (bulkBody: any) => Promise<void>;
-    uploadReport: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string | undefined, reportformatschema: string | undefined, module: string | undefined, percentage: string | undefined, makercheckers: any) => Promise<void>;
+    uploadReport: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string | undefined, reportformatschema: string | undefined, module: string | undefined, percentage: string | undefined, makercheckers: any) => Promise<boolean>;
     uploadReportsBulk: (bulkBody: any, showSuccess?: boolean) => Promise<void>;
     uploadMapping: () => Promise<void>;
     uploadEvents: () => Promise<void>;

package/sf-i-events.js

@@ -2574,7 +2574,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '<td part="td-body"><sf-i-elastic-text text="' + functions + '" minLength="10"></sf-i-elastic-text></td>';
             }
             if (event["risk"] != null) {
-                html += '<td part="td-body"><div part="stream-event-risk-' + event["risk"][0].toLowerCase().replace(/ /g, '-') + '">' + event["risk"][0] + '</div></td>';
+                html += '<td part="td-body"><div part="nc-stream-event-risk-' + event["risk"][0].toLowerCase().replace(/ /g, '-') + '">' + event["risk"][0] + '</div></td>';
             }
             for (var k = 0; k < Object.keys(event).length; k++) {
                 if (this.getEventPreviewFields().includes(Object.keys(event)[k])) {
@@ -3435,21 +3435,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     let flagBulk = false;
                     if (this.selectedItemIds.length == 0) {
-                        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events");
-                        for (var p = 0; p < this.events[mmdd].length; p++) {
-                            if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
-                                this.events[mmdd][p].approved = approved;
-                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                this.events[mmdd][p].lastupdated = new Date().toString();
-                                if (approved) {
-                                    this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                        if (await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")) {
+                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                                    this.events[mmdd][p].approved = approved;
+                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                                    if (approved) {
+                                        this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                                    }
                                 }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(event);
                         }
-                        if (this.recentlyReported[mmdd] == null) {
-                            this.recentlyReported[mmdd] = [];
-                        }
-                        this.recentlyReported[mmdd].push(event);
                     }
                     else {
                         let bulkBodyReview = [];
@@ -3538,21 +3539,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         let flagBulk = false;
                         if (this.selectedItemIds.length == 0) {
-                            await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events");
-                            for (var p = 0; p < this.events[mmdd].length; p++) {
-                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
-                                    this.events[mmdd][p].approved = approved;
-                                    this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                    this.events[mmdd][p].lastupdated = new Date().toString();
-                                    if (approved) {
-                                        this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                            if (await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")) {
+                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                    if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                                        this.events[mmdd][p].approved = approved;
+                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                        this.events[mmdd][p].lastupdated = new Date().toString();
+                                        if (approved) {
+                                            this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                                        }
                                     }
                                 }
+                                if (this.recentlyReported[mmdd] == null) {
+                                    this.recentlyReported[mmdd] = [];
+                                }
+                                this.recentlyReported[mmdd].push(event);
                             }
-                            if (this.recentlyReported[mmdd] == null) {
-                                this.recentlyReported[mmdd] = [];
-                            }
-                            this.recentlyReported[mmdd].push(event);
                         }
                         else {
                             let bulkBodyAudit = [];
@@ -3696,32 +3698,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             else {
                                                 let flagBulk = false;
                                                 if (this.selectedItemIds.length == 0) {
-                                                    await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers);
-                                                    console.log('this.events', this.events);
-                                                    if (this.mode != "next") {
-                                                        for (var p = 0; p < this.events[mmdd].length; p++) {
-                                                            if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
-                                                                this.events[mmdd][p].documents = docs;
-                                                                this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
-                                                                this.events[mmdd][p].lastupdated = new Date().toString();
-                                                            }
-                                                        }
-                                                        if (event.makercheckers.length > 0) {
-                                                            // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                                                    if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)) {
+                                                        console.log('this.events', this.events);
+                                                        if (this.mode != "next") {
                                                             for (var p = 0; p < this.events[mmdd].length; p++) {
                                                                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
-                                                                    this.events[mmdd][p].approved = true;
-                                                                    // this.events[mmdd][p].documents = docs
-                                                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                    this.events[mmdd][p].documents = docs;
+                                                                    this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
                                                                     this.events[mmdd][p].lastupdated = new Date().toString();
                                                                 }
                                                             }
+                                                            if (event.makercheckers.length > 0) {
+                                                                // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                                                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                                                    if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                                                                        this.events[mmdd][p].approved = true;
+                                                                        // this.events[mmdd][p].documents = docs
+                                                                        this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                        this.events[mmdd][p].lastupdated = new Date().toString();
+                                                                    }
+                                                                }
+                                                            }
+                                                            if (this.recentlyReported[mmdd] == null) {
+                                                                this.recentlyReported[mmdd] = [];
+                                                            }
+                                                            this.recentlyReported[mmdd].push(event);
+                                                            console.log('recently reported', this.recentlyReported);
                                                         }
-                                                        if (this.recentlyReported[mmdd] == null) {
-                                                            this.recentlyReported[mmdd] = [];
-                                                        }
-                                                        this.recentlyReported[mmdd].push(event);
-                                                        console.log('recently reported', this.recentlyReported);
                                                     }
                                                 }
                                                 else {
@@ -9122,18 +9125,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let flagBulk = false;
                     if (this.selectedItemIds.length === 0) {
                         console.log('mmddyyyy', mmddyyyy);
-                        await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events");
-                        for (var p = 0; p < this.events[mmdd].length; p++) {
-                            if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                this.events[mmdd][p].lastupdated = new Date().toString();
+                        if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")) {
+                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                                }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(listEvent);
+                            console.log('review single');
                         }
-                        if (this.recentlyReported[mmdd] == null) {
-                            this.recentlyReported[mmdd] = [];
-                        }
-                        this.recentlyReported[mmdd].push(event);
-                        console.log('review single');
                     }
                     else {
                         let bulkBodyReview = [];
@@ -9239,18 +9243,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         let flagBulk = false;
                         if (this.selectedItemIds.length === 0) {
-                            await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events");
-                            for (var p = 0; p < this.events[mmdd].length; p++) {
-                                if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                    this.events[mmdd][p].approved = approved;
-                                    this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")) {
+                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                    if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                        this.events[mmdd][p].approved = approved;
+                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                        this.events[mmdd][p].lastupdated = new Date().toString();
+                                    }
                                 }
+                                if (this.recentlyReported[mmdd] == null) {
+                                    this.recentlyReported[mmdd] = [];
+                                }
+                                this.recentlyReported[mmdd].push(listEvent);
                             }
-                            if (this.recentlyReported[mmdd] == null) {
-                                this.recentlyReported[mmdd] = [];
-                            }
-                            this.recentlyReported[mmdd].push(event);
                             console.log('uploadaudit single');
                         }
                         else {
@@ -9407,32 +9412,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
                                                 let flagBulk = false;
                                                 if (this.selectedItemIds.length === 0) {
-                                                    await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers);
-                                                    console.log('this.events', this.events);
-                                                    for (var p = 0; p < this.events[mmdd].length; p++) {
-                                                        if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                                            this.events[mmdd][p].documents = docs;
-                                                            this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
-                                                            this.events[mmdd][p].lastupdated = new Date().toString();
-                                                        }
-                                                    }
-                                                    console.log('uploadReport single');
-                                                    if (makercheckers.length > 0) {
-                                                        // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                                                    if (await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)) {
+                                                        console.log('this.events', this.events);
                                                         for (var p = 0; p < this.events[mmdd].length; p++) {
                                                             if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                                                this.events[mmdd][p].approved = true;
-                                                                // this.events[mmdd][p].documents = docs
-                                                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                this.events[mmdd][p].documents = docs;
+                                                                this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
                                                                 this.events[mmdd][p].lastupdated = new Date().toString();
                                                             }
                                                         }
-                                                        console.log('upload report auto approve single');
-                                                    }
-                                                    if (this.recentlyReported[mmdd] == null) {
-                                                        this.recentlyReported[mmdd] = [];
+                                                        console.log('uploadReport single');
+                                                        if (makercheckers.length > 0) {
+                                                            // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                                                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                                                if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                                                    this.events[mmdd][p].approved = true;
+                                                                    // this.events[mmdd][p].documents = docs
+                                                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                                                                }
+                                                            }
+                                                            console.log('upload report auto approve single');
+                                                        }
+                                                        if (this.recentlyReported[mmdd] == null) {
+                                                            this.recentlyReported[mmdd] = [];
+                                                        }
+                                                        this.recentlyReported[mmdd].push(listEvent);
                                                     }
-                                                    this.recentlyReported[mmdd].push(event);
                                                 }
                                                 else {
                                                     let bulkBody = [];
@@ -10211,17 +10217,18 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let flagBulk = false;
                     if (this.selectedItemIds.length === 0) {
                         // console.log('mmddyyyy', mmddyyyy)
-                        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events");
-                        for (var p = 0; p < this.events[mmdd].length; p++) {
-                            if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                this.events[mmdd][p].lastupdated = new Date().toString();
+                        if (await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")) {
+                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                                }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(event);
                         }
-                        if (this.recentlyReported[mmdd] == null) {
-                            this.recentlyReported[mmdd] = [];
-                        }
-                        this.recentlyReported[mmdd].push(event);
                     }
                     else {
                         let bulkBodyReview = [];
@@ -10326,18 +10333,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         let flagBulk = false;
                         if (this.selectedItemIds.length === 0) {
-                            await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events");
-                            for (var p = 0; p < this.events[mmdd].length; p++) {
-                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                    this.events[mmdd][p].approved = approved;
-                                    this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                            if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")) {
+                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                    if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                        this.events[mmdd][p].approved = approved;
+                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                        this.events[mmdd][p].lastupdated = new Date().toString();
+                                    }
                                 }
+                                if (this.recentlyReported[mmdd] == null) {
+                                    this.recentlyReported[mmdd] = [];
+                                }
+                                this.recentlyReported[mmdd].push(event);
                             }
-                            if (this.recentlyReported[mmdd] == null) {
-                                this.recentlyReported[mmdd] = [];
-                            }
-                            this.recentlyReported[mmdd].push(event);
                         }
                         else {
                             let bulkBodyAudit = [];
@@ -10495,30 +10503,31 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                     //console.log('makerscheckers', makercheckers, reportercomments);
                                                     // console.log('reportformatvalues', reportformatvalues)
                                                     // console.log('reportformatschema',reportformatschema)
-                                                    await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers);
-                                                    console.log('this.events', this.events);
-                                                    for (var p = 0; p < this.events[mmdd].length; p++) {
-                                                        if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                                            this.events[mmdd][p].documents = docs;
-                                                            this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
-                                                            this.events[mmdd][p].lastupdated = new Date().toString();
-                                                        }
-                                                    }
-                                                    if (makercheckers.length > 0) {
-                                                        // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                                                    if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)) {
+                                                        console.log('this.events', this.events);
                                                         for (var p = 0; p < this.events[mmdd].length; p++) {
                                                             if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                                                this.events[mmdd][p].approved = true;
-                                                                // this.events[mmdd][p].documents = docs
-                                                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                this.events[mmdd][p].documents = docs;
+                                                                this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
                                                                 this.events[mmdd][p].lastupdated = new Date().toString();
                                                             }
                                                         }
+                                                        if (makercheckers.length > 0) {
+                                                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                                                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                                                    this.events[mmdd][p].approved = true;
+                                                                    // this.events[mmdd][p].documents = docs
+                                                                    this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                    this.events[mmdd][p].lastupdated = new Date().toString();
+                                                                }
+                                                            }
+                                                        }
+                                                        if (this.recentlyReported[mmdd] == null) {
+                                                            this.recentlyReported[mmdd] = [];
+                                                        }
+                                                        this.recentlyReported[mmdd].push(event);
                                                     }
-                                                    if (this.recentlyReported[mmdd] == null) {
-                                                        this.recentlyReported[mmdd] = [];
-                                                    }
-                                                    this.recentlyReported[mmdd].push(event);
                                                 }
                                                 else {
                                                     let bulkBody = [];
@@ -16941,6 +16950,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "username": this.userName,
                 "module": module
             };
+            let retValue = true;
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
@@ -16962,7 +16972,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
                 this.setError(jsonRespose.error);
+                retValue = false;
             }
+            return retValue;
         };
         this.uploadAuditsBulk = async (bulkBody) => {
             let url = "https://" + this.apiId + "/uploadauditsbulk";
@@ -16995,6 +17007,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "username": this.userName,
                 "module": module
             };
+            let retValue = true;
             //console.log('uploading review', body);
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
@@ -17016,11 +17029,13 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
-                this.setError(jsonRespose.message);
+                this.setError(jsonRespose.error);
                 setTimeout(() => {
                     this.clearMessages();
                 }, 3000);
+                retValue = false;
             }
+            return retValue;
         };
         this.uploadReportsReviewsBulk = async (bulkBody) => {
             let url = "https://" + this.apiId + "/uploadreportsreviewsbulk";
@@ -17035,7 +17050,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
-                this.setError(jsonRespose.message);
+                this.setError(jsonRespose.error);
                 setTimeout(() => {
                     this.clearMessages();
                 }, 3000);
@@ -17054,14 +17069,14 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
-                this.setError(jsonRespose.message);
+                this.setError(jsonRespose.error);
                 setTimeout(() => {
                     this.clearMessages();
                 }, 3000);
             }
         };
         this.uploadReport = async (entityId, locationId, mmddyyyy, eventid, comments, doc, docs, event, reportformatvalues = "", reportformatschema = "", module = "events", percentage = "100", makercheckers) => {
-            let url = "https://" + this.apiId + "/uploadreport1";
+            let url = "https://" + this.apiId + "/uploadreport2";
             let body = {
                 "mmddyyyy": mmddyyyy,
                 "projectid": this.projectId,
@@ -17084,6 +17099,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "makercheckers": makercheckers
             };
             //console.log(body);
+            let retValue = true;
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
@@ -17104,14 +17120,17 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
-                this.setError(jsonRespose.message);
+                console.log();
+                this.setError(jsonRespose.error);
                 setTimeout(() => {
                     this.clearMessages();
                 }, 3000);
+                retValue = false;
             }
+            return retValue;
         };
         this.uploadReportsBulk = async (bulkBody, showSuccess = true) => {
-            let url = "https://" + this.apiId + "/uploadreportsbulk1";
+            let url = "https://" + this.apiId + "/uploadreportsbulk2";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization));
             if (showSuccess) {
@@ -17127,7 +17146,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             else {
                 const jsonRespose = JSON.parse(xhr.responseText);
-                this.setError(jsonRespose.message);
+                this.setError(jsonRespose.error);
                 setTimeout(() => {
                     this.clearMessages();
                 }, 3000);

package/src/sf-i-events.ts

@@ -4779,7 +4779,7 @@ export class SfIEvents extends LitElement {
       html += '<td part="td-body"><sf-i-elastic-text text="'+functions+'" minLength="10"></sf-i-elastic-text></td>';
     }
     if(event["risk"] != null){
-      html += '<td part="td-body"><div part="stream-event-risk-' + event["risk"][0].toLowerCase().replace(/ /g,'-') + '">'+event["risk"][0]+'</div></td>';
+      html += '<td part="td-body"><div part="nc-stream-event-risk-' + event["risk"][0].toLowerCase().replace(/ /g,'-') + '">'+event["risk"][0]+'</div></td>';
     }
     for(var k = 0; k < Object.keys(event).length; k++) {
       if(this.getEventPreviewFields().includes(Object.keys(event)[k])) {
@@ -5775,21 +5775,22 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length == 0){
           
-          await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-              this.events[mmdd][p].approved = approved 
-              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-              this.events[mmdd][p].lastupdated = new Date().toString()
-              if(approved){
-                this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+          if(await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                this.events[mmdd][p].approved = approved 
+                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                this.events[mmdd][p].lastupdated = new Date().toString()
+                if(approved){
+                  this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+                }
               }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
         }else{
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -5886,21 +5887,22 @@ export class SfIEvents extends LitElement {
         } else {
           let flagBulk = false;
           if(this.selectedItemIds.length == 0){
-            await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-            for( var p = 0 ; p < this.events[mmdd].length; p ++){
-              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
-                if(approved){
-                  this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+            if(await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                  this.events[mmdd][p].approved = approved
+                  this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                  if(approved){
+                    this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+                  }
                 }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(event)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
           }else{
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6071,35 +6073,36 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length == 0){
                         
-                        await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)
+                        if(await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)){
                         
-                        console.log('this.events', this.events);
-                        if(this.mode != "next"){
-                          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                              this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                              this.events[mmdd][p].lastupdated = new Date().toString()
-                            }
-                          }
-                          
-                          if(event.makercheckers.length > 0) {
-
-                            // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                          console.log('this.events', this.events);
+                          if(this.mode != "next"){
                             for( var p = 0 ; p < this.events[mmdd].length; p ++){
                               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                                this.events[mmdd][p].approved = true
-                                // this.events[mmdd][p].documents = docs
-                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                                 this.events[mmdd][p].lastupdated = new Date().toString()
                               }
                             }
+                            
+                            if(event.makercheckers.length > 0) {
+
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                                  this.events[mmdd][p].approved = true
+                                  // this.events[mmdd][p].documents = docs
+                                  this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                  this.events[mmdd][p].lastupdated = new Date().toString()
+                                }
+                              }
+                            }
+                            if(this.recentlyReported[mmdd] == null){
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(event)
+                            console.log('recently reported', this.recentlyReported)
                           }
-                          if(this.recentlyReported[mmdd] == null){
-                            this.recentlyReported[mmdd] = []
-                          }
-                          this.recentlyReported[mmdd].push(event)
-                          console.log('recently reported', this.recentlyReported)
                         }
                       }else{
                         let bulkBody = []
@@ -12658,19 +12661,20 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length === 0) {
           console.log('mmddyyyy', mmddyyyy)
-          await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")
-          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-            if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-              
-              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-              this.events[mmdd][p].lastupdated = new Date().toString()
+          if(await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                
+                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                this.events[mmdd][p].lastupdated = new Date().toString()
+              }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(listEvent)
+            console.log('review single')
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
-          console.log('review single')
         } else {
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -12785,18 +12789,19 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length === 0) {
 
-            await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")
-            for( var p = 0 ; p < this.events[mmdd].length; p ++){
-              if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
+            if(await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                  this.events[mmdd][p].approved = approved
+                  this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(listEvent)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
             console.log('uploadaudit single')
           } else {
             let bulkBodyAudit = []
@@ -12987,34 +12992,34 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length === 0) {
 
-                        await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)
-                        console.log('this.events', this.events);
-                        for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                          if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                            this.events[mmdd][p].documents = docs
-                            this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                            this.events[mmdd][p].lastupdated = new Date().toString()
-                          }
-                        }
-                        console.log('uploadReport single')
-                        if(makercheckers.length > 0) {
-
-                          // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                        if(await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)){
+                          console.log('this.events', this.events);
                           for( var p = 0 ; p < this.events[mmdd].length; p ++){
                             if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                              this.events[mmdd][p].approved = true
-                              // this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                              this.events[mmdd][p].documents = docs
+                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                               this.events[mmdd][p].lastupdated = new Date().toString()
                             }
                           }
-                          console.log('upload report auto approve single')
-                        }
-                        if(this.recentlyReported[mmdd] == null){
-                          this.recentlyReported[mmdd] = []
-                        }
-                        this.recentlyReported[mmdd].push(event)
+                          console.log('uploadReport single')
+                          if(makercheckers.length > 0) {
 
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                              if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                                this.events[mmdd][p].approved = true
+                                // this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].lastupdated = new Date().toString()
+                              }
+                            }
+                            console.log('upload report auto approve single')
+                          }
+                          if(this.recentlyReported[mmdd] == null){
+                            this.recentlyReported[mmdd] = []
+                          }
+                          this.recentlyReported[mmdd].push(listEvent)
+                        }
                       } else {
                         let bulkBody = []
                         let bulkBodyReview = []
@@ -13953,18 +13958,19 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length === 0) {
           // console.log('mmddyyyy', mmddyyyy)
-          await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-              
-              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-              this.events[mmdd][p].lastupdated = new Date().toString()
+          if(await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                
+                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                this.events[mmdd][p].lastupdated = new Date().toString()
+              }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
         } else {
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -14057,7 +14063,7 @@ export class SfIEvents extends LitElement {
       (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-audit')?.addEventListener('click', async (ev: any) => {
         let buttonClick = ev.target as HTMLButtonElement
         buttonClick.innerHTML = "Saving..."
-        const comments = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
+        const comments: string = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
         const approved = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked;
         if(approved == event.approved){
           buttonClick.innerHTML = "Save"
@@ -14078,18 +14084,19 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length === 0) {
 
-            await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-            for( var p = 0 ; p < this.events[mmdd].length; p ++){
-              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
+            if(await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                  this.events[mmdd][p].approved = approved
+                  this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(event)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
           } else {
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -14280,32 +14287,32 @@ export class SfIEvents extends LitElement {
                         //console.log('makerscheckers', makercheckers, reportercomments);
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
-                        await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)
-                        console.log('this.events', this.events);
-                        for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                          if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                            this.events[mmdd][p].documents = docs
-                            this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                            this.events[mmdd][p].lastupdated = new Date().toString()
-                          }
-                        }
-                        if(makercheckers.length > 0) {
-
-                          // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                        if(await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)){
+                          console.log('this.events', this.events);
                           for( var p = 0 ; p < this.events[mmdd].length; p ++){
                             if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                              this.events[mmdd][p].approved = true
-                              // this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                              this.events[mmdd][p].documents = docs
+                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                               this.events[mmdd][p].lastupdated = new Date().toString()
                             }
                           }
-                        }
-                        if(this.recentlyReported[mmdd] == null){
-                          this.recentlyReported[mmdd] = []
-                        }
-                        this.recentlyReported[mmdd].push(event)
+                          if(makercheckers.length > 0) {
 
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                                this.events[mmdd][p].approved = true
+                                // this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].lastupdated = new Date().toString()
+                              }
+                            }
+                          }
+                          if(this.recentlyReported[mmdd] == null){
+                            this.recentlyReported[mmdd] = []
+                          }
+                          this.recentlyReported[mmdd].push(event)
+                        }
                       } else {
                         let bulkBody = []
                         let bulkBodyReview = []
@@ -22447,6 +22454,7 @@ export class SfIEvents extends LitElement {
       "username": this.userName,
       "module" : module
     } 
+    let retValue = true;
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
@@ -22469,7 +22477,9 @@ export class SfIEvents extends LitElement {
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
       this.setError(jsonRespose.error);
+      retValue = false;
     }
+    return retValue;
   }
   uploadAuditsBulk = async (bulkBody: any) => {
     let url = "https://"+this.apiId+"/uploadauditsbulk";
@@ -22506,7 +22516,7 @@ export class SfIEvents extends LitElement {
       "username": this.userName,
       "module" : module
     } 
-
+    let retValue = true;
     //console.log('uploading review', body);
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
@@ -22529,11 +22539,13 @@ export class SfIEvents extends LitElement {
       
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
+      retValue = false;
     }
+    return retValue;
   }
   uploadReportsReviewsBulk = async (bulkBody: any) => {
     let url = "https://"+this.apiId+"/uploadreportsreviewsbulk";
@@ -22549,7 +22561,7 @@ export class SfIEvents extends LitElement {
       
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
@@ -22569,7 +22581,7 @@ export class SfIEvents extends LitElement {
       
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
@@ -22577,7 +22589,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "events", percentage: string = "100", makercheckers: any) => {
-    let url = "https://"+this.apiId+"/uploadreport1";
+    let url = "https://"+this.apiId+"/uploadreport2";
 
     let body = { 
       "mmddyyyy": mmddyyyy,
@@ -22602,7 +22614,7 @@ export class SfIEvents extends LitElement {
     }
 
     //console.log(body);
-
+    let retValue = true;
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
@@ -22624,15 +22636,18 @@ export class SfIEvents extends LitElement {
       
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      console.log()
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
+      retValue = false;
     }
+    return retValue;
   }
 
   uploadReportsBulk = async (bulkBody: any, showSuccess: boolean = true) => {
-    let url = "https://"+this.apiId+"/uploadreportsbulk1"
+    let url = "https://"+this.apiId+"/uploadreportsbulk2"
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization)) as any;
@@ -22649,7 +22664,7 @@ export class SfIEvents extends LitElement {
       
     } else {
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);