From 51ea24c108fbf22789a4463fb369abaa66bd4a99 Mon Sep 17 00:00:00 2001
From: naresh rai <naresh.rai@t-systems.com>
Date: Thu, 14 Oct 2021 14:50:21 +0530
Subject: [PATCH] added monthly report checkbox without any functionality +
 changed the order of the settings on notification page

---
 templates/settings/form.php     | 34 +++++++++++++++++----------------
 templates/settings/personal.php | 10 ++++++----
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/templates/settings/form.php b/templates/settings/form.php
index d5df7c8e4..db33c0ae0 100644
--- a/templates/settings/form.php
+++ b/templates/settings/form.php
@@ -27,6 +27,24 @@
 /** @var \OCP\IL10N $l */
 ?>
 
+<?php if ($_['email_enabled']) { ?>
+	<?php if (!$_['is_email_set']): ?>
+		<br />
+		<br />
+		<h3><strong><?php p($l->t('Notification')); ?></strong></h3>
+		<!-- <strong><?php p($l->t('You need to set up your email address before you can receive notification emails.')); ?></strong> -->
+	<?php endif; ?>
+
+
+	<label for="notify_setting_batchtime"><?php p($l->t('Send activity emails:')); ?></label>
+	<select id="notify_setting_batchtime" name="notify_setting_batchtime">
+		<option value="3"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_ASAP): ?> selected="selected"<?php endif; ?>><?php p($l->t('As soon as possible')); ?></option>
+		<option value="0"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_HOURLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Hourly')); ?></option>
+		<option value="1"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_DAILY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Daily')); ?></option>
+		<option value="2"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_WEEKLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Weekly')); ?></option>
+	</select>
+<?php }?>
+
 	<table class="grid activitysettings">
 		<tbody>
 		<?php foreach ($_['activityGroups'] as $group): ?>
@@ -61,19 +79,3 @@
 		<?php endforeach; ?>
 		</tbody>
 	</table>
-
-<?php if ($_['email_enabled']) { ?>
-	<?php if (!$_['is_email_set']): ?>
-		<br />
-		<strong><?php p($l->t('You need to set up your email address before you can receive notification emails.')); ?></strong>
-	<?php endif; ?>
-
-	<br />
-	<label for="notify_setting_batchtime"><?php p($l->t('Send activity emails:')); ?></label>
-	<select id="notify_setting_batchtime" name="notify_setting_batchtime">
-		<option value="3"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_ASAP): ?> selected="selected"<?php endif; ?>><?php p($l->t('As soon as possible')); ?></option>
-		<option value="0"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_HOURLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Hourly')); ?></option>
-		<option value="1"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_DAILY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Daily')); ?></option>
-		<option value="2"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_WEEKLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Weekly')); ?></option>
-	</select>
-<?php }
diff --git a/templates/settings/personal.php b/templates/settings/personal.php
index 4ed5cfcc0..75db86d9b 100644
--- a/templates/settings/personal.php
+++ b/templates/settings/personal.php
@@ -33,14 +33,16 @@
 			<?php p($l->t('Choose for which activities you want to get a push notification.')); ?>
 		<?php } ?>
 	</p>
+	<h3><strong><?php p($l->t('Daily activity summary')); ?></strong></h3>
+	<input type="checkbox" class="checkbox" id="monthly_report">
+    <label for="monthly_report"><?php p($l->t('Monthly Status Report.')); ?></label>
 
-	<?php print_unescaped($this->inc('settings/form')); ?>
-
-	<h2><?php p($l->t('Daily activity summary')); ?></h2>
-
+	<br />
 	<input id="activity_email_enabled" name="activity_digest" type="checkbox" class="checkbox"
 		   value="1" <?php if ($_['activity_digest_enabled']) {
 	print_unescaped('checked="checked"');
 } ?> />
 	<label for="activity_email_enabled"><?php p($l->t('Send daily activity summary in the morning')); ?></label>
+
+	<?php print_unescaped($this->inc('settings/form')); ?>
 </form>