Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scheduled_messages: Show Monday option on Fridays and Saturdays. 

On Fridays and Saturdays, users will be presented with the option
to schedule a message to send on Monday at 9:00 am.

Fixes: #25402.
This commit is contained in:
Karl Stolley 2023-05-03 12:42:49 -05:00 committed by Tim Abbott
parent 2084a91af9
commit ac0bd7bb7d
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
web/src/popover_menus.js
View File

@ -811,6 +811,17 @@ export function initialize() {
},
};
const send_later_monday = {
monday_nine_am: {
text: $t({defaultMessage: "Monday at 9:00 AM"}),
time: "9:00 am",
},
};
const send_later_custom = {
text: $t({defaultMessage: "Custom"}),
};
function set_compose_box_schedule(element) {
const send_later_in = element.id;
const send_later_class = element.classList[0];
@ -829,6 +840,15 @@ export function initialize() {
format(date.setDate(date.getDate()), "MMM d yyyy ") + send_time;
return send_at_time;
}
case "send_later_monday": {
const send_time = send_later_monday[send_later_in].time;
const date = new Date();
// Subtract from 8 to find the next Monday.
const monday_offset = 8 - date.getDay();
const scheduled_date = date.setDate(date.getDate() + monday_offset);
const send_at_time = format(scheduled_date, "MMM d yyyy ") + send_time;
return send_at_time;
}
// No default
}
blueslip.error("Not a valid time.");
@ -868,8 +888,10 @@ export function initialize() {
// Only show send later options that are possible today.
const date = new Date();
const day = date.getDay(); // Starts with 0 for Sunday.
const hours = date.getHours();
let possible_send_later_today = {};
let possible_send_later_monday = {};
if (hours <= 8) {
possible_send_later_today = send_later_today;
} else if (hours <= 15) {
@ -877,11 +899,19 @@ export function initialize() {
} else {
possible_send_later_today = false;
}
// Show send_later_monday options only on Fridays and Saturdays.
if (day >= 5) {
possible_send_later_monday = send_later_monday;
} else {
possible_send_later_monday = false;
}
$("body").append(
render_send_later_modal({
possible_send_later_today,
send_later_tomorrow,
possible_send_later_monday,
send_later_custom,
}),
);
overlays.open_modal("send_later_modal", {
@ -916,7 +946,7 @@ export function initialize() {
});
$send_later_modal.one(
"click",
".send_later_today, .send_later_tomorrow",
".send_later_today, .send_later_tomorrow, .send_later_monday",
(e) => {
const send_at_time = set_compose_box_schedule(e.currentTarget);
do_schedule_message(send_at_time);

7
web/templates/send_later_modal.hbs
View File

@ -22,6 +22,13 @@
<a id="{{@key}}" class="send_later_tomorrow" tabindex="0">{{this.text}}</a>
</li>
{{/each}}
{{#if possible_send_later_monday }}
{{#each possible_send_later_monday}}
<li>
<a id="{{@key}}" class="send_later_monday" tabindex="0">{{this.text}}</a>
</li>
{{/each}}
{{/if}}
<li>
<a class="send_later_custom" tabindex="0">{{t 'Custom time'}}</a>
</li>