From e0377d4b2fa3bb048b4b7c9d8b12ea37f7fc27db Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 5 Aug 2022 11:56:41 -0400 Subject: [PATCH 1/4] Add translations to schedules page --- .../templates/panel/server_schedule_edit.html | 408 ++++++++++-------- .../templates/panel/server_schedules.html | 79 ++-- app/translations/en_EN.json | 18 + 3 files changed, 295 insertions(+), 210 deletions(-) diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index ae4e54e3..a084d53a 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -9,14 +9,15 @@
- +

- {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ data['server_stats']['server_id']['server_name'] }} -
- UUID: {{ data['server_stats']['server_id']['server_uuid'] }} + {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{ + data['server_stats']['server_id']['server_name'] }} +
+ UUID: {{ data['server_stats']['server_id']['server_uuid'] }}

@@ -24,159 +25,206 @@
- {% include "parts/details_stats.html" %} + {% include "parts/details_stats.html" %}
- {% include "parts/server_controls_list.html" %} + {% include "parts/server_controls_list.html" %} -
-
- {% if data['new_schedule'] == True %} -
- {% else %} - +
+
+ {% if data['new_schedule'] == True %} + + {% else %} + {% end %} - {% raw xsrf_form_html() %} - - + {% raw xsrf_form_html() %} + + -
-
- -
-
-
- -
-
-
- - -
-
- -
-
-
- - -
-
-
- +
+

{{ translate('serverScheduleConfig', 'children' , data['lang']) }}

+ +
+
+ + +
+ + {% end %} - -
- - -{% end %} - -{% block js %} - + window.onload(startup()) + -{% end %} + {% end %} \ No newline at end of file diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index 0898d881..1afc3b40 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -44,7 +44,8 @@
-

Scheduled Tasks

+

{{ translate('serverSchedules', + 'scheduledTasks', data['lang']) }}

{% if data['user_data']['hints'] %}
+ class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}
- - - - - - - + + + + + + + @@ -82,7 +91,7 @@ - - - + + + @@ -137,11 +149,11 @@ @@ -152,7 +164,8 @@
- + @@ -160,36 +173,39 @@
  • -

    ID

    +

    {{ translate('serverSchedules', 'name', data['lang']) }}

    {{schedule.schedule_id}}

  • -

    Action

    +

    {{ translate('serverSchedules', 'action', data['lang']) }}

    {{schedule.action}}

  • -

    Command

    +

    {{ translate('serverSchedules', 'command', data['lang']) }}

    {{schedule.command}}

  • {% if schedule.interval != '' %} -

    Interval

    -

    Every {{schedule.interval}} {{schedule.interval_type}}

    +

    {{ translate('serverSchedules', 'interval', data['lang']) }}

    +

    {{ translate('serverSchedules', 'every', data['lang']) }} {{schedule.interval}} + {{schedule.interval_type}}

    {% elif schedule.interval_type == 'reaction' %} -

    Interval

    -

    {{schedule.interval_type}}

    child of ID: {{ schedule.parent }}

    +

    {{ translate('serverSchedules', 'interval', data['lang']) }}

    +

    {{schedule.interval_type}}

    {{ translate('serverSchedules', 'child', + data['lang']) }}: {{ schedule.parent }}

    {% else %} -

    Interval

    -

    Cron String: {{schedule.cron_string}}

    +

    {{ translate('serverSchedules', 'interval', data['lang']) }}

    +

    {{ translate('serverSchedules', 'cron', data['lang']) }}: {{schedule.cron_string}} +

    {% end %}
  • -

    Next Run

    +

    {{ translate('serverSchedules', 'nextRun', data['lang']) }}

    {{schedule.next_run}}

  • -

    Enabled

    +

    {{ translate('serverSchedules', 'enabled', data['lang']) }}

    @@ -200,12 +216,15 @@ - +
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 041e4615..7f25d93b 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -392,6 +392,7 @@ }, "serverScheduleConfig": { "backup": "Backup Server", + "select": "Basic / Cron / Chain Reaction Select", "basic": "Basic", "children": "Linked Child Tasks: ", "command": "Command", @@ -418,7 +419,24 @@ "time-explain": "What time do you want your schedule to execute?" }, "serverSchedules": { + "scheduledTasks": "Scheduled Tasks", + "create": "Create New Schedule", + "name": "Name", + "action": "Action", + "command": "Command", + "interval": "Interval", + "nextRun": "Next Run", + "enabled": "Enabled", + "edit": "Edit", + "every": "Every", + "yes": "Yes", + "no": "No", + "cron": "Crong String", + "details": "Schedule Details", + "child": "Child of schedule named: ", "areYouSure": "Delete Scheduled Task?", + "close": "Close", + "delete": "Delete", "cancel": "Cancel", "cannotSee": "Not seeing everything?", "cannotSeeOnMobile": "Try clicking on a scheduled task for full details.", From 75c8cdef5352953242b5b2e63819373d41b49102 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 5 Aug 2022 13:52:50 -0400 Subject: [PATCH 2/4] Add names to schedules --- .../controllers/management_controller.py | 4 ++-- app/classes/models/management.py | 6 +++--- app/classes/shared/tasks.py | 4 +++- app/classes/web/panel_handler.py | 14 ++++++++++++++ .../templates/panel/server_schedule_edit.html | 18 ++++++++++++------ .../templates/panel/server_schedules.html | 13 +++++++++---- .../20220805_schedule_rename_comment.py | 17 +++++++++++++++++ app/translations/en_EN.json | 2 +- 8 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 app/migrations/20220805_schedule_rename_comment.py diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py index b0b1f10a..547a8ebd 100644 --- a/app/classes/controllers/management_controller.py +++ b/app/classes/controllers/management_controller.py @@ -76,7 +76,7 @@ class ManagementController: interval_type, start_time, command, - comment=None, + name, enabled=True, ): return HelpersManagement.create_scheduled_task( @@ -86,7 +86,7 @@ class ManagementController: interval_type, start_time, command, - comment, + name, enabled, ) diff --git a/app/classes/models/management.py b/app/classes/models/management.py index c3eed588..67d1ff9c 100644 --- a/app/classes/models/management.py +++ b/app/classes/models/management.py @@ -110,7 +110,7 @@ class Schedules(BaseModel): interval_type = CharField() start_time = CharField(null=True) command = CharField(null=True) - comment = CharField() + name = CharField() one_time = BooleanField(default=False) cron_string = CharField(default="") parent = IntegerField(null=True) @@ -265,7 +265,7 @@ class HelpersManagement: interval_type, start_time, command, - comment=None, + name, enabled=True, one_time=False, cron_string="* * * * *", @@ -281,7 +281,7 @@ class HelpersManagement: Schedules.interval_type: interval_type, Schedules.start_time: start_time, Schedules.command: command, - Schedules.comment: comment, + Schedules.name: name, Schedules.one_time: one_time, Schedules.cron_string: cron_string, Schedules.parent: parent, diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py index 260ceaa8..7055d1cb 100644 --- a/app/classes/shared/tasks.py +++ b/app/classes/shared/tasks.py @@ -303,7 +303,7 @@ class TasksManager: job_data["interval_type"], job_data["start_time"], job_data["command"], - "None", + job_data["name"], job_data["enabled"], job_data["one_time"], job_data["cron_string"], @@ -318,6 +318,7 @@ class TasksManager: # Check to see if it's enabled and is not a chain reaction. if job_data["enabled"] and job_data["interval_type"] != "reaction": + new_job = "error" if job_data["cron_string"] != "": try: new_job = self.scheduler.add_job( @@ -447,6 +448,7 @@ class TasksManager: ) if job_data["enabled"] and job_data["interval"] != "reaction": + new_job = "error" if job_data["cron_string"] != "": try: new_job = self.scheduler.add_job( diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index b5a07eb3..d70f98c0 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -968,6 +968,10 @@ class PanelHandler(BaseHandler): page_data["schedule"]["server_id"] = server_id page_data["schedule"]["schedule_id"] = schedule.schedule_id page_data["schedule"]["action"] = schedule.action + if schedule.name: + page_data["schedule"]["name"] = schedule.name + else: + page_data["schedule"]["name"] = "" page_data["schedule"][ "children" ] = self.controller.management.get_child_schedules(sch_id) @@ -1557,6 +1561,7 @@ class PanelHandler(BaseHandler): difficulty = bleach.clean(self.get_argument("difficulty", None)) server_obj = self.controller.servers.get_server_obj(server_id) enabled = bleach.clean(self.get_argument("enabled", "0")) + name = bleach.clean(self.get_argument("name", "")) if difficulty == "basic": action = bleach.clean(self.get_argument("action", None)) interval = bleach.clean(self.get_argument("interval", None)) @@ -1621,6 +1626,7 @@ class PanelHandler(BaseHandler): if interval_type == "days": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, @@ -1635,6 +1641,7 @@ class PanelHandler(BaseHandler): } elif difficulty == "reaction": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, @@ -1650,6 +1657,7 @@ class PanelHandler(BaseHandler): } elif difficulty == "advanced": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": "", @@ -1665,6 +1673,7 @@ class PanelHandler(BaseHandler): } else: job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, @@ -1714,6 +1723,7 @@ class PanelHandler(BaseHandler): difficulty = bleach.clean(self.get_argument("difficulty", None)) server_obj = self.controller.servers.get_server_obj(server_id) enabled = bleach.clean(self.get_argument("enabled", "0")) + name = bleach.clean(self.get_argument("name", "")) if difficulty == "basic": action = bleach.clean(self.get_argument("action", None)) interval = bleach.clean(self.get_argument("interval", None)) @@ -1777,6 +1787,7 @@ class PanelHandler(BaseHandler): if interval_type == "days": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, @@ -1791,6 +1802,7 @@ class PanelHandler(BaseHandler): } elif difficulty == "advanced": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": "", @@ -1806,6 +1818,7 @@ class PanelHandler(BaseHandler): } elif difficulty == "reaction": job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, @@ -1821,6 +1834,7 @@ class PanelHandler(BaseHandler): } else: job_data = { + "name": name, "server_id": server_id, "action": action, "interval_type": interval_type, diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index a084d53a..34057466 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -47,6 +47,12 @@ +
+ + +
+

@@ -141,12 +147,12 @@ {% for schedule in data['schedules'] %} {% if schedule.schedule_id != data['schedule']['schedule_id'] %} {% if schedule.interval != '' %} - {% else %} - + {% end %} {% end %} {% end %} @@ -181,8 +187,8 @@
    {% for schedule in data['schedule']['children'] %}
  • {{schedule.schedule_id}} - | {{schedule.command}}
    • + href="/panel/edit_schedule?id={{schedule.server_id}}&sch_id={{schedule.schedule_id}}">{{schedule.name}} + | {{schedule.schedule_id}} {% end %}
diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index 1afc3b40..a64bb1ad 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -81,7 +81,7 @@ {% for schedule in data['schedules'] %}
IDActionCommandIntervalNext RunEnabledEdit{{ translate('serverSchedules', 'name', data['lang']) }} + {{ translate('serverSchedules', 'action', data['lang']) + }}{{ translate('serverSchedules', 'command', + data['lang']) }}{{ translate('serverSchedules', 'interval', + data['lang']) }}{{ translate('serverSchedules', 'nextRun', + data['lang']) }}{{ translate('serverSchedules', 'enabled', + data['lang']) }}{{ translate('serverSchedules', 'edit', data['lang']) + }}
{% if schedule.interval != '' %} -

Every

+

{{ translate('serverSchedules', 'every', data['lang']) }}

{{schedule.interval}} {{schedule.interval_type}}

{% elif schedule.interval_type == 'reaction' %}

{{schedule.interval_type}}

child of ID: {{ schedule.parent }}

@@ -120,9 +129,12 @@ style="table-layout:fixed;">
ActionCommandEnabled{{ translate('serverSchedules', 'action', data['lang']) + }}{{ translate('serverSchedules', 'command', + data['lang']) }}{{ translate('serverSchedules', 'enabled', + data['lang']) }}
{% if schedule.enabled %} - Yes + {{ translate('serverSchedules', 'yes', data['lang']) }} {% else %} - No + {{ translate('serverSchedules', 'no', data['lang']) }} {% end %}
-

{{schedule.schedule_id}}

+

{{schedule.name}}

{{schedule.action}}

@@ -94,7 +94,8 @@

{{ translate('serverSchedules', 'every', data['lang']) }}

{{schedule.interval}} {{schedule.interval_type}}

{% elif schedule.interval_type == 'reaction' %} -

{{schedule.interval_type}}

child of ID: {{ schedule.parent }}

+

{{schedule.interval_type}}

{{ translate('serverSchedules', 'child', data['lang'])}}: + {{ schedule.parent }}

{% else %}

Cron String:

{{schedule.cron_string}}

@@ -201,7 +202,11 @@

  • {{ translate('serverSchedules', 'nextRun', data['lang']) }}

    + {% if schedule.next_run %}

    {{schedule.next_run}}

    + {% else %} +

    zzzzzzz

    + {% end %}
  • @@ -322,7 +327,7 @@ $(document).ready(function () { console.log('ready for JS!') $('#schedule_table').DataTable({ - 'order': [4, 'desc'] + 'order': [4, 'asc'], } ); @@ -330,7 +335,7 @@ $(document).ready(function () { console.log('ready for JS!') $('#mini_schedule_table').DataTable({ - 'order': [2, 'desc'] + 'order': [2, 'asc'] } ); document.getElementById('mini_schedule_table_wrapper').hidden = true; diff --git a/app/migrations/20220805_schedule_rename_comment.py b/app/migrations/20220805_schedule_rename_comment.py new file mode 100644 index 00000000..5cd70739 --- /dev/null +++ b/app/migrations/20220805_schedule_rename_comment.py @@ -0,0 +1,17 @@ +# Generated by database migrator +import peewee + + +def migrate(migrator, database, **kwargs): + migrator.rename_column("schedules", "comment", "name") + + """ + Write your migrations here. + """ + + +def rollback(migrator, database, **kwargs): + migrator.rename_column("schedules", "name", "comment") + """ + Write your rollback migrations here. + """ diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 7f25d93b..4a63f4cd 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -433,7 +433,7 @@ "no": "No", "cron": "Crong String", "details": "Schedule Details", - "child": "Child of schedule named: ", + "child": "Child of schedule named ", "areYouSure": "Delete Scheduled Task?", "close": "Close", "delete": "Delete", From 3c8614f3788f2188a69fa490fe309e012fdc1ab4 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 5 Aug 2022 16:01:26 -0400 Subject: [PATCH 3/4] Fix traceback when editing schedule --- app/classes/web/panel_handler.py | 1 + app/translations/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index d70f98c0..8b66b12b 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -901,6 +901,7 @@ class PanelHandler(BaseHandler): page_data["new_schedule"] = True page_data["schedule"] = {} page_data["schedule"]["children"] = [] + page_data["schedule"]["name"] = "" page_data["schedule"]["server_id"] = server_id page_data["schedule"]["schedule_id"] = "" page_data["schedule"]["action"] = "" diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 4a63f4cd..7afe934f 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -433,7 +433,7 @@ "no": "No", "cron": "Crong String", "details": "Schedule Details", - "child": "Child of schedule named ", + "child": "Child of schedule with ID ", "areYouSure": "Delete Scheduled Task?", "close": "Close", "delete": "Delete", From 3cd190e15c5d14fa2341f63a6bbf1a70216aabd5 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 6 Aug 2022 00:30:57 +0100 Subject: [PATCH 4/4] Update changelog !419 Also add untracked changes (direct commits to dev) --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a931dea..8a7b3e5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,12 @@ ### New features TBD ### Bug fixes -TBD +- Fix Schedules Traceback Bug ([Merge Request |](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/419) [Commit |](https://gitlab.com/crafty-controller/crafty-4/-/commit/f69d79b7023d6c26fccb5caeae9e47b40ebe5af2) [Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/ad318296dc93beb5533fcd13066440df9f9e799a)) ### Tweaks - credits-v2| Translator status ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/421)) +- Use Names in Schedules ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/419)) ### Lang -TBD +- Make Schedules panel translatable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/419))

    ## --- [4.0.8] - 2022/08/05