Initialize setting review / proposal stage page #782
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,3 +8,8 @@ | |
| .text-emphasize { | ||
| @include roboto-medium(); | ||
| } | ||
|
|
||
| .input-customized-size input{ | ||
| width: 16.2em; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| .material-switch > input[type="checkbox"] { | ||
| display: none; | ||
| } | ||
|
|
||
| .material-switch > label { | ||
| cursor: pointer; | ||
| height: 0px; | ||
| position: relative; | ||
| width: 40px; | ||
| } | ||
|
|
||
| .material-switch > label::before { | ||
| background: rgb(0, 0, 0); | ||
| box-shadow: inset 0px 0px 10px rgba(0, 0, 0, 0.5); | ||
| border-radius: 8px; | ||
| content: ''; | ||
| height: 16px; | ||
| margin-top: -8px; | ||
| position:absolute; | ||
| opacity: 0.3; | ||
| transition: all 0.4s ease-in-out; | ||
| width: 40px; | ||
| } | ||
|
|
||
| .material-switch > label::after { | ||
| background: rgb(255, 255, 255); | ||
| border-radius: 16px; | ||
| box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3); | ||
| content: ''; | ||
| height: 24px; | ||
| left: -4px; | ||
| margin-top: -8px; | ||
| position: absolute; | ||
| top: -4px; | ||
| transition: all 0.3s ease-in-out; | ||
| width: 24px; | ||
| } | ||
|
|
||
| .material-switch > input[type="checkbox"]:checked + label::before { | ||
| background: inherit; | ||
| opacity: 0.5; | ||
| } | ||
|
|
||
| .material-switch > input[type="checkbox"]:checked + label::after { | ||
| background: inherit; | ||
| left: 20px; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
|
|
||
| var proposals_creatable = document.getElementById("proposals.creatable"); | ||
| var proposals_editable = document.getElementById("proposals.editable"); | ||
| var proposals_withdrawable = document.getElementById("proposals.withdrawable"); | ||
| var reviews_stage = document.getElementById("reviews.stage"); | ||
| var reviews_visible_to_submitters = document.getElementById("reviews.visible.to.submitters"); | ||
|
|
||
| $('.hotkey').click(function () { | ||
| if ($(this).val() == "Call for Proposals") { | ||
| Call_for_Proposals(); | ||
| } | ||
| else if ($(this).val() == "First Round Review_1") { | ||
| First_Round_Review_1() | ||
| } | ||
| else if ($(this).val() == "First Round Review_2") { | ||
| First_Round_Review_2() | ||
| } | ||
| else if ($(this).val() == "Modification Stage") { | ||
| Modification_Stage() | ||
| } | ||
| else if ($(this).val() == "Second Round Review") { | ||
| Second_Round_Review() | ||
| } | ||
| else if ($(this).val() == "Internal Decision") { | ||
| Internal_Decision() | ||
| } | ||
| else { | ||
| Announcement_of_Acceptance() | ||
| } | ||
|
|
||
| /* | ||
| Proposal Review Stage Setting | ||
| Reference : https://github.com/pycontw/pycon.tw/blob/master/src/reviews/README.md | ||
| */ | ||
| function Call_for_Proposals(){ | ||
| proposals_creatable.checked = true; | ||
| proposals_editable.checked = true; | ||
| proposals_withdrawable.checked = true; | ||
| reviews_stage.value = 0; | ||
| reviews_visible_to_submitters.checked = false; | ||
| } | ||
| function First_Round_Review_1() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = false; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "0"; | ||
| reviews_visible_to_submitters.checked = false; | ||
| } | ||
| function First_Round_Review_2() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = false; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "1"; | ||
| reviews_visible_to_submitters.checked = false; | ||
| } | ||
| function Modification_Stage() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = true; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "0"; | ||
| reviews_visible_to_submitters.checked = true; | ||
| } | ||
| function Second_Round_Review() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = false; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "2"; | ||
| reviews_visible_to_submitters.checked = false; | ||
| } | ||
| function Internal_Decision() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = false; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "0"; | ||
| reviews_visible_to_submitters.checked = false; | ||
| } | ||
| function Announcement_of_Acceptance() { | ||
| proposals_creatable.checked = false; | ||
| proposals_editable.checked = true; | ||
| proposals_withdrawable.checked = false; | ||
| reviews_stage.value = "0"; | ||
| reviews_visible_to_submitters.checked = true; | ||
| } | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| {% extends 'dashboard_base.html' %} | ||
|
|
||
| {% load i18n static %} | ||
| {% load proposals %} | ||
| {% load compress crispy_forms_tags %} | ||
| {% load tz %} | ||
| {% get_current_timezone as TIME_ZONE %} | ||
|
|
||
| {% block dashboard_tablist %} | ||
| {% include '_includes/dashboard_tablist.html' with active='admin' %} | ||
| {% endblock dashboard_tablist %} | ||
|
|
||
| {% block main-content %} | ||
|
|
||
| <h3 class="dashboard-header"> | ||
| <span class="header-title">{% trans 'Review Stages' %}</span> | ||
| </h3> | ||
|
|
||
| <div class="dashboard-body"> | ||
| <!--Hot Key Button--> | ||
| <div class="col-md-3"> | ||
| {% for rs in review_stages_list %} | ||
| <button class="btn btn-natural-noborder hotkey" value="{{ rs }}">{{ rs }}</button> | ||
| {% endfor %} | ||
| </div> | ||
| <!--Review Change Setting--> | ||
| <div class="col-md-9"> | ||
|
tomatoprinx marked this conversation as resolved.
Outdated
|
||
| <form action="{% url 'review_stages' %}" method="post"> | ||
| {% csrf_token %} | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading">{% trans 'Review Stages' %} | ||
| <div class="material-switch pull-right"> | ||
| <a href="https://github.com/pycontw/pycon.tw/blob/master/src/reviews/README.md">See Proposal Review System | ||
| Documentation</a> | ||
| </div> | ||
| </div> | ||
| <ul class="list-group"> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".proposals.creatable"|configuration_switch }} | ||
| <div class="material-switch pull-right"> | ||
| <input name="proposals.creatable" type='hidden' value="false" /> | ||
| <input id="proposals.creatable" name="proposals.creatable" type="checkbox" value="true"/> | ||
| <label for="proposals.creatable" class="label-info"></label> | ||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".proposals.editable"|configuration_switch }} | ||
| <div class="material-switch pull-right"> | ||
| <input name="proposals.editable" type='hidden' value="false" /> | ||
| <input id="proposals.editable" name="proposals.editable" type="checkbox" value="true"/> | ||
| <label for="proposals.editable" class="label-info"></label> | ||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".proposals.withdrawable"|configuration_switch }} | ||
| <div class="material-switch pull-right"> | ||
| <input name="proposals.withdrawable" type='hidden' value="false" /> | ||
| <input id="proposals.withdrawable" name="proposals.withdrawable" type="checkbox" value="true"/> | ||
| <label for="proposals.withdrawable" class="label-info"></label> | ||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".reviews.visible.to.submitters"|configuration_switch }} | ||
| <div class="material-switch pull-right"> | ||
| <input name="reviews.visible.to.submitters" type='hidden' value="false" /> | ||
| <input id="reviews.visible.to.submitters" name="reviews.visible.to.submitters" | ||
| type="checkbox" value="true"/> | ||
| <label for="reviews.visible.to.submitters" class="label-info"></label> | ||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".reviews.stage"|configuration_switch }} | ||
| <div class="input-customized-size pull-right"> | ||
| <input id="reviews.stage" name="reviews.stage" type="number" min="0" max="2" | ||
| placeholder="Int" required="required"> | ||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| {{ ".proposals.disable.after"|configuration_switch }} | ||
| <div class="input-customized-size pull-right"> | ||
| <input name="proposals.disable.after" type="datetime-local" step="1" | ||
| placeholder="yyyy-mm-dd hh:mm:ss" required="required"> | ||
|
Member
There was a problem hiding this comment. I am having doubts about making this field "required" because I think we should be able to disable it by not providing any value? And another thing is that the backend needs the format exactly as You can take a look at how django implements this here: They take multiple possible formats and try one another, described in here https://docs.djangoproject.com/en/3.0/ref/settings/#datetime-input-formats I think this is a little bit too much, but if you have time you can try this. The bottom line is at least make it more user friendly and the frontend hint needs to meet the backend validation criteria.
Contributor
Author
There was a problem hiding this comment. Consider accepting values without ss -> 9ef909e
Contributor
Author
There was a problem hiding this comment. But on the other hand, what does it mean that we should be able to disable it by not providing any value ? Is it for users to change a value individually?
Member
There was a problem hiding this comment. What I meant is that, |
||
| </div> | ||
| </li> | ||
| <li class="panel-title list-group-item"> | ||
| timezone | ||
| <div class="input-customized-size pull-right"> | ||
| <select name="review_timezone"> | ||
| {% for tz in timezones %} | ||
| <option value="{{ tz }}" {% if tz == TIME_ZONE %} selected{% endif %}>{{ tz }}</option> | ||
| {% endfor %} | ||
| </select> | ||
| </div> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div class="nesting-form-group"> | ||
| {{ form|crispy }} | ||
| <button type="submit" class="btn btn-info pull-right"> | ||
| {% trans 'Submit' %} | ||
| </button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
|
|
||
| {% endblock main-content %} | ||
|
|
||
| {% block extra_js %} | ||
| {% compress js %} | ||
| <script src="{% static 'js/reviews/review_stages.js' %}"></script> | ||
| {% endcompress %} | ||
| {% endblock extra_js %} | ||
|
Member
There was a problem hiding this comment. I think you should read current values from the database and show current settings on page load. Something like <script src="{% static 'js/reviews/review_stages.js' %}"></script>
<script>
proposals_creatable.checked = {% if proposals_creatable %}true{% else %}false;
proposals_editable.checked = {% if proposals_editable %}true{% else %}false;
proposals_withdrawable.checked = {% if proposals_withdrawable %}true{% else %}false;
reviews_stage.value = {{ reviews_stage }};
reviews_visible_to_submitters.checked = {% if reviews_visible_to_submitters %}true{% else %}false;
</script>The above is just a sample code, very ugly, but just a simple demonstration of how django template variables and javscript can be integrated together.
Contributor
Author
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. Maybe the two functions of the current review stage status and the set review stage can be presented in different pages ？Do you have more ideas ?
Member
There was a problem hiding this comment. uh... what I mean is that the boolean switches should represent the current set values. So that when the admin sees the page, current settings are clear. And the admin can do some minor tuning without "not knowning" what current values look like. 我想用中文可能比較好表達。原本是不會載入目前的設定的，所以每次進來這一頁都是 false、或者是空的值。這樣其實很難一目瞭然目前到底是哪一個階段，或者是說目前的設定到底是長怎樣。期待的樣子是我進來的時候，所有的值就是目前的設定。舉個很爛的例子，假設目前是 editable、withdrawable 是開的，然後突然要很臨時的開放 creatable 一小段時間，我就只要把 creatable 打開，然後時間過了我再把它關起來。我就不需要再一個一個確認其他某一個的值是什麼，然後小心翼翼的調整怕弄錯，然後改完又要再小心翼翼的改回去。 |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.