From 5971a6c1aae3bc044142795adda45da6c3e39ee6 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Thu, 23 Jan 2025 17:15:49 -0500
Subject: [PATCH 1/5] wip

---
 .../dashboard/scheduled-events-modal.html     | 35 +++++++++++++++++++
 .../dashboard/scheduled-events-modal.js       | 19 +++++++++-
 locales/en.json                               |  4 +++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
index 20e7f2a3..e9611c45 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
@@ -85,6 +85,41 @@ <h4 class="modal-title">
           ng-model="scheduled_events.end_voting.event_at"
         />
       </label>
+      <!-- allow_tally checkbox -->
+      <label
+        for="allow-tally-enable"
+        class="descriptive-checkbox"
+        ng-class="{'disabled': !enabled.allow_tally}"
+      >
+        <input
+          id="allow-tally-enable"
+          type="checkbox"
+          name="allow-tally-enable"
+          ng-model="enabled.allow_tally"
+        />
+        <span
+          class="header"
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.allowTallyEnable">
+        </span>
+      </label>
+      <!-- allow_tally selector -->
+      <label
+        for="allow-tally-selector"
+        class="descriptive-selector"
+        ng-class="{'disabled': !enabled.allow_tally}"
+      >
+        <span 
+          class="header"
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.allowTallySelector"
+        ></span>
+        <input
+          id="allow-tally-selector"
+          ng-disabled="!enabled.allow_tally"
+          type="datetime-local"
+          name="allow-tally-selector"
+          ng-model="scheduled_events.allow_tally.event_at"
+        />
+      </label>
     </form>
   </div>
   <div class="modal-footer">
diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
index 9e890e83..e113ac58 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
@@ -39,12 +39,21 @@ angular.module('avAdmin')
             election.scheduled_events.end_voting.event_at
           ) ? new Date(election.scheduled_events.end_voting.event_at)
           : null
+        },
+        allow_tally: {
+          event_at: (
+            election.scheduled_events &&
+            election.scheduled_events.allow_tally &&
+            election.scheduled_events.allow_tally.event_at
+          ) ? new Date(election.scheduled_events.allow_tally.event_at)
+          : null
         }
       };
 
       $scope.enabled = {
         start_voting: $scope.isEnabled('start_voting'),
-        end_voting: $scope.isEnabled('end_voting')
+        end_voting: $scope.isEnabled('end_voting'),
+        allow_tally: $scope.isEnabled('allow_tally')
       };
 
       function getISOString(date)
@@ -71,6 +80,14 @@ angular.module('avAdmin')
             ) ? {
               event_at: getISOString($scope.scheduled_events.end_voting.event_at)
             } : null
+          ),
+          allow_tally: (
+            (
+              $scope.enabled.allow_tally &&
+              !!$scope.scheduled_events.allow_tally.event_at
+            ) ? {
+              event_at: getISOString($scope.scheduled_events.allow_tally.event_at)
+            } : null
           )
         };
         $modalInstance.close(scheduledEvents);
diff --git a/locales/en.json b/locales/en.json
index a6951042..63640175 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -659,6 +659,10 @@
             "startVotingSelector": "Select date:",
             "endVotingEnable": "Automatically stop the election",
             "endVotingSelector": "Select date:",
+            "allowTallyEnable": "Automatically allow tally",
+            "allowTallySelector": "Select date:",
+            "tallyEnable": "Automatically tally",
+            "tallySelector": "Select date:",
             "confirm": "Confirm to change scheduled events",
             "success": "Changed the configuration of scheduled events successfully.",
             "error": "Error changing the configuration of scheduled events."

From 09e02fd6d67a35151b32d4677903cbedea5fff01 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Thu, 23 Jan 2025 17:22:36 -0500
Subject: [PATCH 2/5] wip

---
 .../dashboard/scheduled-events-modal.html     | 35 +++++++++++++++++++
 .../dashboard/scheduled-events-modal.js       | 19 +++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
index e9611c45..aa3c8342 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
@@ -120,6 +120,41 @@ <h4 class="modal-title">
           ng-model="scheduled_events.allow_tally.event_at"
         />
       </label>
+      <!-- tally checkbox -->
+      <label
+        for="tally-enable"
+        class="descriptive-checkbox"
+        ng-class="{'disabled': !enabled.tally}"
+      >
+        <input
+          id="tally-enable"
+          type="checkbox"
+          name="tally-enable"
+          ng-model="enabled.tally"
+        />
+        <span
+          class="header"
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.tallyEnable">
+        </span>
+      </label>
+      <!-- tally selector -->
+      <label
+        for="tally-selector"
+        class="descriptive-selector"
+        ng-class="{'disabled': !enabled.tally}"
+      >
+        <span 
+          class="header"
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.tallySelector"
+        ></span>
+        <input
+          id="tally-selector"
+          ng-disabled="!enabled.tally"
+          type="datetime-local"
+          name="tally-selector"
+          ng-model="scheduled_events.tally.event_at"
+        />
+      </label>
     </form>
   </div>
   <div class="modal-footer">
diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
index e113ac58..76d9621e 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
@@ -47,13 +47,22 @@ angular.module('avAdmin')
             election.scheduled_events.allow_tally.event_at
           ) ? new Date(election.scheduled_events.allow_tally.event_at)
           : null
+        },
+        tally: {
+          event_at: (
+            election.scheduled_events &&
+            election.scheduled_events.tally &&
+            election.scheduled_events.tally.event_at
+          ) ? new Date(election.scheduled_events.tally.event_at)
+          : null
         }
       };
 
       $scope.enabled = {
         start_voting: $scope.isEnabled('start_voting'),
         end_voting: $scope.isEnabled('end_voting'),
-        allow_tally: $scope.isEnabled('allow_tally')
+        allow_tally: $scope.isEnabled('allow_tally'),
+        tally: $scope.isEnabled('tally')
       };
 
       function getISOString(date)
@@ -88,6 +97,14 @@ angular.module('avAdmin')
             ) ? {
               event_at: getISOString($scope.scheduled_events.allow_tally.event_at)
             } : null
+          ),
+          tally: (
+            (
+              $scope.enabled.tally &&
+              !!$scope.scheduled_events.tally.event_at
+            ) ? {
+              event_at: getISOString($scope.scheduled_events.tally.event_at)
+            } : null
           )
         };
         $modalInstance.close(scheduledEvents);

From 530cef1f1054b9ecbb89dbb0ea250ecc555c79b2 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Thu, 23 Jan 2025 17:30:40 -0500
Subject: [PATCH 3/5] wip

---
 .../dashboard/scheduled-events-modal.html     | 30 +++++++++----------
 .../dashboard/scheduled-events-modal.js       | 18 +++++------
 locales/en.json                               |  4 +--
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
index aa3c8342..1239bc46 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.html
@@ -120,39 +120,39 @@ <h4 class="modal-title">
           ng-model="scheduled_events.allow_tally.event_at"
         />
       </label>
-      <!-- tally checkbox -->
+      <!-- start tally checkbox -->
       <label
-        for="tally-enable"
+        for="start-tally-enable"
         class="descriptive-checkbox"
-        ng-class="{'disabled': !enabled.tally}"
+        ng-class="{'disabled': !enabled.start_tally}"
       >
         <input
-          id="tally-enable"
+          id="start-tally-enable"
           type="checkbox"
-          name="tally-enable"
-          ng-model="enabled.tally"
+          name="start-tally-enable"
+          ng-model="enabled.start_tally"
         />
         <span
           class="header"
-          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.tallyEnable">
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.startTallyEnable">
         </span>
       </label>
-      <!-- tally selector -->
+      <!-- start tally selector -->
       <label
-        for="tally-selector"
+        for="start-tally-selector"
         class="descriptive-selector"
-        ng-class="{'disabled': !enabled.tally}"
+        ng-class="{'disabled': !enabled.start_tally}"
       >
         <span 
           class="header"
-          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.tallySelector"
+          ng-i18next="avAdmin.dashboard.modals.configureScheduledEvents.startTallySelector"
         ></span>
         <input
-          id="tally-selector"
-          ng-disabled="!enabled.tally"
+          id="start-tally-selector"
+          ng-disabled="!enabled.start_tally"
           type="datetime-local"
-          name="tally-selector"
-          ng-model="scheduled_events.tally.event_at"
+          name="start-tally-selector"
+          ng-model="scheduled_events.start_tally.event_at"
         />
       </label>
     </form>
diff --git a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
index 76d9621e..929fb9eb 100644
--- a/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
+++ b/avAdmin/admin-directives/dashboard/scheduled-events-modal.js
@@ -48,12 +48,12 @@ angular.module('avAdmin')
           ) ? new Date(election.scheduled_events.allow_tally.event_at)
           : null
         },
-        tally: {
+        start_tally: {
           event_at: (
             election.scheduled_events &&
-            election.scheduled_events.tally &&
-            election.scheduled_events.tally.event_at
-          ) ? new Date(election.scheduled_events.tally.event_at)
+            election.scheduled_events.start_tally &&
+            election.scheduled_events.start_tally.event_at
+          ) ? new Date(election.scheduled_events.start_tally.event_at)
           : null
         }
       };
@@ -62,7 +62,7 @@ angular.module('avAdmin')
         start_voting: $scope.isEnabled('start_voting'),
         end_voting: $scope.isEnabled('end_voting'),
         allow_tally: $scope.isEnabled('allow_tally'),
-        tally: $scope.isEnabled('tally')
+        start_tally: $scope.isEnabled('start_tally')
       };
 
       function getISOString(date)
@@ -98,12 +98,12 @@ angular.module('avAdmin')
               event_at: getISOString($scope.scheduled_events.allow_tally.event_at)
             } : null
           ),
-          tally: (
+          start_tally: (
             (
-              $scope.enabled.tally &&
-              !!$scope.scheduled_events.tally.event_at
+              $scope.enabled.start_tally &&
+              !!$scope.scheduled_events.start_tally.event_at
             ) ? {
-              event_at: getISOString($scope.scheduled_events.tally.event_at)
+              event_at: getISOString($scope.scheduled_events.start_tally.event_at)
             } : null
           )
         };
diff --git a/locales/en.json b/locales/en.json
index 63640175..85adc49c 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -661,8 +661,8 @@
             "endVotingSelector": "Select date:",
             "allowTallyEnable": "Automatically allow tally",
             "allowTallySelector": "Select date:",
-            "tallyEnable": "Automatically tally",
-            "tallySelector": "Select date:",
+            "startTallyEnable": "Automatically tally",
+            "startTallySelector": "Select date:",
             "confirm": "Confirm to change scheduled events",
             "success": "Changed the configuration of scheduled events successfully.",
             "error": "Error changing the configuration of scheduled events."

From a4d8f6503063b427e009066a4f358d7b3ba72a13 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 29 Jan 2025 19:54:19 -0500
Subject: [PATCH 4/5] wip

---
 .../activity-log/activity-log.html            | 50 +++++++++++++++++++
 locales/en.json                               |  6 +++
 2 files changed, 56 insertions(+)

diff --git a/avAdmin/admin-directives/activity-log/activity-log.html b/avAdmin/admin-directives/activity-log/activity-log.html
index 9c0d75c1..b7a252ea 100644
--- a/avAdmin/admin-directives/activity-log/activity-log.html
+++ b/avAdmin/admin-directives/activity-log/activity-log.html
@@ -189,6 +189,56 @@ <h2 ng-i18next>avAdmin.activityLog.title</h2>
               })avAdmin.activityLog.action.authevent.resumeSuccess
             </div>
 
+            <div ng-if="obj.action_name === 'authevent:start_tally:scheduled'" ng-i18next>
+              [i18next:html]({
+                executer_username: obj.executer_username,
+                executer_id: obj.executer_id,
+                receiver_username: obj.receiver_username,
+                receiver_id: obj.receiver_id,
+                event_id: obj.event_id,
+                new_event_date: obj.metadata.new_event_date,
+                new_task_id: obj.metadata.new_task_id,
+                child_election: election.childrenElectionNames[obj.metadata.auth_event],
+              })avAdmin.activityLog.action.authevent.startTallyScheduled
+            </div>
+            <div ng-if="obj.action_name === 'authevent:start_tally:revoked'" ng-i18next>
+              [i18next:html]({
+                executer_username: obj.executer_username,
+                executer_id: obj.executer_id,
+                receiver_username: obj.receiver_username,
+                receiver_id: obj.receiver_id,
+                event_id: obj.event_id,
+                old_event_date: obj.metadata.old_event_date,
+                old_task_id: obj.metadata.old_task_id,
+                child_election: election.childrenElectionNames[obj.metadata.auth_event],
+              })avAdmin.activityLog.action.authevent.startTallyRevoked
+            </div>
+
+            <div ng-if="obj.action_name === 'authevent:allow-tally:scheduled'" ng-i18next>
+              [i18next:html]({
+                executer_username: obj.executer_username,
+                executer_id: obj.executer_id,
+                receiver_username: obj.receiver_username,
+                receiver_id: obj.receiver_id,
+                event_id: obj.event_id,
+                new_event_date: obj.metadata.new_event_date,
+                new_task_id: obj.metadata.new_task_id,
+                child_election: election.childrenElectionNames[obj.metadata.auth_event],
+              })avAdmin.activityLog.action.authevent.allowTallyScheduled
+            </div>
+            <div ng-if="obj.action_name === 'authevent:allow-tally:revoked'" ng-i18next>
+              [i18next:html]({
+                executer_username: obj.executer_username,
+                executer_id: obj.executer_id,
+                receiver_username: obj.receiver_username,
+                receiver_id: obj.receiver_id,
+                event_id: obj.event_id,
+                old_event_date: obj.metadata.old_event_date,
+                old_task_id: obj.metadata.old_task_id,
+                child_election: election.childrenElectionNames[obj.metadata.auth_event],
+              })avAdmin.activityLog.action.authevent.allowTallyRevoked
+            </div>
+
             <div ng-if="obj.action_name === 'authevent:start_voting:scheduled'" ng-i18next>
               [i18next:html]({
                 executer_username: obj.executer_username,
diff --git a/locales/en.json b/locales/en.json
index 85adc49c..977ad332 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -194,6 +194,12 @@
           "suspendSuccess": "<i>__executer_username__ (__executer_id__)</i> <strong>succeeded suspending</strong> election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> __child_election__",
           "resumeError": "<i>__executer_username__ (__executer_id__)</i> <strong>error resuming</strong> election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> __child_election__",
           "resumeSuccess": "<i>__executer_username__ (__executer_id__)</i> <strong>succeeded resuming</strong> election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> __child_election__",
+
+
+          "startTallyScheduled": "<i>__executer_username__ (__executer_id__)</i> <strong>scheduled start tally</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__new_event_date__</strong> with task id __new_task_id__ __child_election__",
+          "startTallyRevoked": "<i>__executer_username__ (__executer_id__)</i> <strong>revoked start tally</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__old_event_date__</strong> with task id __old_task_id__ __child_election__",
+          "allowTallyScheduled": "<i>__executer_username__ (__executer_id__)</i> <strong>scheduled allow tally</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__new_event_date__</strong> with task id __new_task_id__ __child_election__",
+          "allowTallyRevoked": "<i>__executer_username__ (__executer_id__)</i> <strong>revoked allow tally</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__old_event_date__</strong> with task id __old_task_id__ __child_election__",
           "startVotingScheduled": "<i>__executer_username__ (__executer_id__)</i> <strong>scheduled start voting</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__new_event_date__</strong> with task id __new_task_id__ __child_election__",
           "startVotingRevoked": "<i>__executer_username__ (__executer_id__)</i> <strong>revoked start voting</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__old_event_date__</strong> with task id __old_task_id__ __child_election__",
           "endVotingScheduled": "<i>__executer_username__ (__executer_id__)</i> <strong>scheduled end voting</strong> period for election <a href=\"/admin/dashboard/__event_id__\">__event_id__</a> at <strong>__new_event_date__</strong> with task id __new_task_id__ __child_election__",

From 5a718941cd072327f8a377386443bb244263f7c6 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Wed, 29 Jan 2025 20:01:21 -0500
Subject: [PATCH 5/5] wip

---
 avAdmin/admin-directives/activity-log/activity-log.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avAdmin/admin-directives/activity-log/activity-log.html b/avAdmin/admin-directives/activity-log/activity-log.html
index b7a252ea..e6df94cd 100644
--- a/avAdmin/admin-directives/activity-log/activity-log.html
+++ b/avAdmin/admin-directives/activity-log/activity-log.html
@@ -214,7 +214,7 @@ <h2 ng-i18next>avAdmin.activityLog.title</h2>
               })avAdmin.activityLog.action.authevent.startTallyRevoked
             </div>
 
-            <div ng-if="obj.action_name === 'authevent:allow-tally:scheduled'" ng-i18next>
+            <div ng-if="obj.action_name === 'authevent:allow_tally:scheduled'" ng-i18next>
               [i18next:html]({
                 executer_username: obj.executer_username,
                 executer_id: obj.executer_id,
@@ -226,7 +226,7 @@ <h2 ng-i18next>avAdmin.activityLog.title</h2>
                 child_election: election.childrenElectionNames[obj.metadata.auth_event],
               })avAdmin.activityLog.action.authevent.allowTallyScheduled
             </div>
-            <div ng-if="obj.action_name === 'authevent:allow-tally:revoked'" ng-i18next>
+            <div ng-if="obj.action_name === 'authevent:allow_tally:revoked'" ng-i18next>
               [i18next:html]({
                 executer_username: obj.executer_username,
                 executer_id: obj.executer_id,