OSIS-3197 : Resolve conflicts

Author: BenJneB

.githooks/prepare-commit-msg

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+import re
+import sys
+from subprocess import check_output
+
+
+def strip_comments(code):
+    code = str(code)
+    return re.sub(r'(?m)^ *#.*\n?', '', code)
+
+
+def clean_string(string, issue):
+    string = string.replace(issue, '')
+    string = string.strip()
+    return strip_comments(string)
+
+
+def prefix_commit_msg_with_issue():
+    issue_prefix = branch.index('OSIS')
+    issue = branch[issue_prefix:]
+    print("Issue : " + issue)
+    with open(commit_msg_filepath, 'r+') as fh:
+        commit_msg = fh.read()
+        if not clean_string(commit_msg, issue):
+            print('ERROR :: Commit message is empty !')
+            sys.exit(1)
+        fh.seek(0, 0)
+        fh.write('%s %s' % (issue, commit_msg))
+
+
+commit_msg_filepath = sys.argv[1]
+
+branch = check_output(['git', 'symbolic-ref', '--short', 'HEAD']).strip()
+branch = branch.decode("utf-8")
+
+branches_to_exclude = ['dev', 'test', 'qa', 'master']
+
+if branch not in branches_to_exclude:
+    try:
+        prefix_commit_msg_with_issue()
+    except ValueError:
+        print('WARNING :: commit msg not prefixed with branch name')
+else:
+    print('Incorrect branch name' + branch)
+    sys.exit(1)

assessments/locale/fr_BE/LC_MESSAGES/django.po

@@ -104,7 +104,7 @@ msgid "Are you sure you want to remove the following manager ?"
 msgstr "Êtes-vous sûr de vouloir supprimer le gestionnaire suivant ?"
 
 msgid "By learning unit"
-msgstr "Par unité d'apprentissage"
+msgstr "Par unité d'enseignement"
 
 msgid "By specific criteria"
 msgstr "Par critère spécifique"

assessments/templates/online_double_encoding_form.html

@@ -116,7 +116,7 @@ <h3 class="panel-title" style="font-size: 150%; color: #3399CC;">{{ learning_uni
             <table class="table table-hover">
                 <thead>
                     <tr>
-                        <th>{% trans 'Offer' %}</th>
+                        <th>{% trans 'Training' %}</th>
                         <th>{% trans 'Registration number' %}</th>
                         <th>{% trans 'Lastname' %}</th>
                         <th>{% trans 'Firstname' %}</th>

assessments/templates/online_double_encoding_validation.html

@@ -110,7 +110,7 @@ <h3 class="panel-title" style="font-size: 150%; color: #3399CC;">{{ learning_uni
                         <th colspan="2">{% trans 'Final' %}</th>
                     </tr>
                     <tr>
-                        <th>{%trans 'Offer' %}</th>
+                        <th>{%trans 'Training' %}</th>
                         <th>{%trans 'Registration number' %}</th>
                         <th>{% trans 'Lastname' %}</th>
                         <th>{% trans 'Firstname' %}</th>

assessments/templates/online_encoding.html

@@ -128,14 +128,14 @@ <h3 class="panel-title" style="font-size: 150%; color: #3399CC;">{{ learning_uni
                 {% endif %}><i class="fa fa-hashtag"></i><i class="fa fa-hashtag"></i> {% trans 'Double encoding' %}</a>
         </div>
         &nbsp;
-        <a  id="lnk_score_printing" class="btn btn-default"
+        <a  id="lnk_score_printing" class="btn btn-default no_spinner"
             href="{% url 'notes_printing' learning_unit_year_id=learning_unit_year.id %}"
             data-toggle="tooltip" data-placement="bottom"
             title="{% trans 'Print the scores' %}"
             role="button"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> {% trans 'Print' %}</a>
         &nbsp;
         <div class="btn-group" role="group" aria-label="Excel">
-            <a id="lnk_scores_excel" class="btn btn-default"
+            <a id="lnk_scores_excel" class="btn btn-default no_spinner"
                href="{% url 'scores_encoding_download' learning_unit_year.id %}"
                role="button"
                data-toggle="tooltip" data-placement="bottom"

assessments/templates/online_encoding_form.html

@@ -118,7 +118,7 @@ <h3 class="panel-title" style="font-size: 150%; color: #3399CC;">{{ learning_uni
                 <thead>
                     <tr>
                         <th>{% trans 'Status' %}</th>
-                        <th>{% trans 'Offer' %}</th>
+                        <th>{% trans 'Training' %}</th>
                         <th>{% trans 'Registration number' %}</th>
                         <th>{% trans 'Lastname' %}</th>
                         <th>{% trans 'Firstname' %}</th>

assessments/templates/scores_encoding.html

@@ -61,7 +61,7 @@ <h2>{% trans 'Scores encoding' %}</h2>
                     <form method="get" action="{% url 'scores_encoding' %}" id="form_search_scores_by_offer">
                         <div class="col-md-10">
                             <div class="form-group">
-                                <label>{% trans 'Offer' %}</label><br>
+                                <label>{% trans 'Training' %}</label><br>
                                 <select id="slt_offer_list_selection" name="offer" class="form-control">
                                     <option value="">{% trans 'All'%}</option>
                                     {% for offer_year in offer_year_list %}
@@ -142,7 +142,7 @@ <h2>{% trans 'Scores encoding' %}</h2>
                     </div>
                     <div role="tabpanel" class="tab-pane fade" id="tab_via_paper_{{forloop.counter0}}">
                         <br>
-                        <a class="btn btn-default"
+                        <a class="btn btn-default no_spinner"
                            href="{% url 'notes_printing_all' %}"
                            role="button" id="lnk_notes_printing_all_{{learning_unit_year.id}}">
                             <span class="glyphicon glyphicon-print" aria-hidden="true"></span> {% trans 'Print all courses' %}</a>
@@ -177,7 +177,7 @@ <h2>{% trans 'Scores encoding' %}</h2>
                                     </div>
                                 </td>
                                 <td>
-                                    <a class="btn btn-default"
+                                    <a class="btn btn-default no_spinner"
                                        href="{% url 'notes_printing' note_detail.learning_unit_year_id %}"
                                        role="button" id="lnk_notes_printing_{{note_detail.learning_unit_year_id}}"
                                        data-toggle="tooltip" data-placement="right"
@@ -219,7 +219,7 @@ <h2>{% trans 'Scores encoding' %}</h2>
                                         </div>
                                     </div>
                                 </td>
-                                <td><a class="btn btn-default"
+                                <td><a class="btn btn-default no_spinner"
                                        href="{% url 'scores_encoding_download' note_detail.learning_unit_year_id %}"
                                        role="button"
                                        id="lnk_scores_encoding_download_{{lu.id}}"

assessments/templates/scores_encoding_by_learning_unit.html

@@ -58,7 +58,7 @@
             </div>
             <div class="row">
                 <div class="col-md-3">
-                    <label>{% trans 'Offer' %} {{ offer_sel }}</label><br>
+                    <label>{% trans 'Training' %} {{ offer_sel }}</label><br>
                     <select id="slt_offer_list_selection" name="offer" class="form-control">
                         <option value="">{% trans 'All'%}</option>
                         {% for o in offer_list %}
@@ -275,7 +275,7 @@
                         </div>
                     </td>
                     <td>
-                        <a class="btn btn-default"
+                        <a class="btn btn-default no_spinner"
                            href="{% url 'scores_encoding_download' note_detail.learning_unit_year_id %}"
                            role="button"
                            id="lnk_scores_encoding_download_{{note_detail.learning_unit_year_id}}"
@@ -290,7 +290,7 @@
         </div>
                 <div role="tabpanel" class="tab-pane fade" id="tab_via_paper">
             <br>
-            <a class="btn btn-default {% if not tutor_id or tutor_id == -1 %}disabled{%endif%}"
+            <a class="btn btn-default no_spinner {% if not tutor_id or tutor_id == -1 %}disabled{%endif%}"
                href="{%if tutor_id and tutor_id != -1 and offer_year_id %}
                         {% url 'notes_printing_all' tutor_id=tutor_id offer_id=offer_year_id %}
                      {%else%}
@@ -362,7 +362,7 @@
                         </div>
                     </td>
                     <td>
-                        <a class="btn btn-default"
+                        <a class="btn btn-default no_spinner"
                            href="{% url 'notes_printing' note_detail.learning_unit_year_id%}"
                            role="button" id="lnk_notes_printing_{{note_detail.learning_unit_year_id}}"
                            data-toggle="tooltip" data-placement="right"

assessments/templates/scores_encoding_by_specific_criteria.html

@@ -68,7 +68,7 @@
                     </select>
                 </div>
                 <div class="col-md-2">
-                    <label>{% trans 'Offer' %}</label><br>
+                    <label>{% trans 'Training' %}</label><br>
                     <select id="slt_program" name="program" class="form-control">
                         <option value="">{% trans 'All'%}</option>
                         {% for o in offer_list %}
@@ -100,7 +100,7 @@
                     <thead>
                         <tr>
                             <th>{% trans 'Status' %}</th>
-                            <th>{% trans 'Offer' %}</th>
+                            <th>{% trans 'Training' %}</th>
                             <th>{% trans 'Learning unit' %}</th>
                             <th>{% trans 'Registration ID' %}</th>
                             <th>{% trans 'Lastname' %}</th>

assessments/templates/scores_responsible/list.html

@@ -132,7 +132,7 @@ <h2>{% trans 'Scores responsibles' %} - {{ filter.academic_year }}</h2>
                     "dataSrc": "object_list",
                     "data": function(d) {
                         let pageNumber = {{ page_obj.number }};
-                        return getDataAjaxTable(domTable, d, pageNumber);
+                        return getDataAjaxTable("search_form", domTable, d, pageNumber);
                     },
                     "traditional": true
                 },