Enhance user friendliness : display current review stage setting

pycontw · Dec 22, 2020 · 2fb312d · 2fb312d
1 parent d579e69
commit 2fb312d
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 6 deletions.
diff --git a/src/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po
@@ -1449,6 +1449,18 @@ msgstr "審查"
 msgid "Review Stages"
 msgstr "審查階段"
 
+#: templates/default/_includes/dashboard_tablist.html:28
+#: templates/default/reviews/review_stages.html:12
+#: templates/default/reviews/review_stages.html:18
+msgid "Current Review Stage Setting"
+msgstr "目前審查階段設定"
+
+#: templates/default/_includes/dashboard_tablist.html:28
+#: templates/default/reviews/review_stages.html:12
+#: templates/default/reviews/review_stages.html:18
+msgid "Set Review Stage"
+msgstr "設定審查階段"
+
 #: templates/default/_includes/nav/dashboard_nav.html:10
 msgid "Log out"
 msgstr "登出"

diff --git a/src/templates/default/reviews/review_stages.html b/src/templates/default/reviews/review_stages.html
@@ -13,12 +13,56 @@
 {% block main-content %}
 
 <h3 class="dashboard-header">
-	<span class="header-title">{% trans 'Review Stages' %}</span>
+	<span class="header__title">{% trans 'Review Stages' %}</span>
 </h3>
 
 <div class="dashboard-body">
 	<div class="row">
+		<!--Current Setting-->
+		<div class="panel panel-default">
+			<div class="panel-heading">{% trans 'Current Review Stage Setting' %}</div>
+			<ul class="list-group">
+				<li class="panel-body list-group-item">
+					{{ ".proposals.creatable"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.proposals_creatable }}</p>
+					</div>
+				</li>
+				<li class="panel-body list-group-item">
+					{{ ".proposals.editable"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.proposals_editable }}</p>
+					</div>
+				</li>
+				<li class="panel-body list-group-item">
+					{{ ".proposals.withdrawable"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.proposals_withdrawable }}</p>
+					</div>
+				</li>
+				<li class="panel-body list-group-item">
+					{{ ".proposals.reviews.visible.to.submitters"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.reviews_visible_to_submitters }}</p>
+					</div>
+				</li>
+				<li class="panel-body list-group-item">
+					{{ ".proposals.reviews.stage"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.reviews_stage }}</p>
+					</div>
+				</li>
+				<li class="panel-body list-group-item">
+					{{ ".proposals.proposals.disable.after"|configuration_switch }}
+					<div class="pull-right">
+						<p>{{ current_review_stages_setting.proposals_disable_after }}</p>
+					</div>
+			</ul>
+		</div>
 		<!--Hot Key Button-->
+		<br>
+		<h4>{% trans 'Set Review Stage' %}</h4>
+		<br>
 		{% for rs in review_stages_list %}
 			<button class="btn btn-natural-noborder hotkey" value="{{ rs }}">{{ rs }}</button>
 		{% endfor %}

diff --git a/src/users/views.py b/src/users/views.py
@@ -201,6 +201,7 @@ def get_context_data(self, **kwargs):
         return context
 
 def review_stages(request):
+    current_review_stages_setting = {}
     review_stages_list = [
         'Call for Proposals',
         'Locked (proposal editing and reviewing disabled)',
@@ -214,7 +215,6 @@ def review_stages(request):
     ]
 
     if request.method == 'POST':
-
         date_time_obj = date_preprocess(
             DATETIME_INPUT_FORMATS, request.POST['proposals.disable.after'])
         tz_selectd = pytz.timezone(request.POST['review_timezone'])
@@ -230,15 +230,21 @@ def review_stages(request):
                 value = request.POST[tag]
             reg[key] = value
 
-        messages.info(
-            request,
-            'This setting has been changed successfully and the review stage will expire at '
-            + str(loc_dt) + ' (' + request.POST.get('review_timezone') + ')')
+        messages.info(request, 'This setting has been changed successfully.')
+    else:
+        for tag in review_stages_var:
+            key = settings.CONFERENCE_DEFAULT_SLUG + '.' + tag
+            value = reg.get(key, '')
+            # Django template language does not support dictionary keys containing "."
+            if "." in tag:
+                tag = tag.replace(".", "_")
+            current_review_stages_setting[tag] = value
 
     return render(
         request, 'reviews/review_stages.html', {
             'timezones': pytz.common_timezones,
             'review_stages_list': review_stages_list,
+            'current_review_stages_setting': current_review_stages_setting,
             **reviews_state()._asdict()
         })