Merge branch 'release/v0.13.0'

Author: kbeker

RELEASE-NOTES.md

@@ -1,3 +1,24 @@
+### v0.13.0
+
+##### Features
+
+- Feature report list view ([#579](https://github.com/Code-Poets/sheetstorm/pull/579))
+- Feature update employees list view ([#580](https://github.com/Code-Poets/sheetstorm/pull/580))
+- Feature add customizable settings ([#590](https://github.com/Code-Poets/sheetstorm/pull/590))
+- Feature add popup messages for create and update users and reports ([#598](https://github.com/Code-Poets/sheetstorm/pull/598))
+- Feature create user with random password ([#595](https://github.com/Code-Poets/sheetstorm/pull/595))
+
+##### Bugfixes
+
+- Bugfix application admin has access to django admin panel ([#591](https://github.com/Code-Poets/sheetstorm/pull/591))
+- Bugfix account details update by admin ([#593](https://github.com/Code-Poets/sheetstorm/pull/593))
+- Bugfix draggable month selector and autocomplete in modal forms ([#596](https://github.com/Code-Poets/sheetstorm/pull/596))
+- Bugfix create report form is cleaned on close ([#597](https://github.com/Code-Poets/sheetstorm/pull/597))
+- Bugfix employees list view styles ([#599](https://github.com/Code-Poets/sheetstorm/pull/599))
+- Bugfix admin not able to create user ([#603](https://github.com/Code-Poets/sheetstorm/pull/603))
+
+
+
 ### v0.12.5
 
 ##### Bugfixes

employees/common/strings.py

@@ -122,3 +122,12 @@ class ReportValidationStrings(NotCallableMixin, Enum):
 class MonthNavigationText(NotCallableMixin, Enum):
     SWITCH_MONTH = _("Go")
     CURRENT_MONTH = _("Current month")
+
+
+class SuccessPopUpMessages(Enum):
+    REPORT_CREATE = _("You have successfully created report for project {project_name}")
+    REPORT_UPDATE = _("You have successfully updated report from {report_date} for project {project_name}")
+    REPORT_UPDATE_BY_ADMIN = _(
+        "You have successfully updated report of user with email {report_author_email} from {report_date} for project {project_name}"
+    )
+    REPORT_DELETE = _("You have successfully deleted report")

employees/factories.py

@@ -12,7 +12,7 @@ class Meta:
         model = Report
 
     date = factory.Faker("date")
-    author = factory.SubFactory("users.factories.UserFactory")
+    author = factory.SubFactory("users.factories.UserFactory", preferences=None)
     project = factory.SubFactory("managers.factories.ProjectFactory")
     work_hours = factory.LazyFunction(lambda: datetime.timedelta(hours=8))
     description = factory.fuzzy.FuzzyText()

employees/static/employees/scripts/expandReportList.js

@@ -1,11 +1,19 @@
 window.expandReportList = function (element, numberOfReports){
-    var currentRow = element.parentElement.parentElement
+    var currentRow = element.parentElement.parentElement;
     var nextTableRow = currentRow.nextElementSibling;
 
     var tipIcon = element.getElementsByClassName("rotated-tip")[0];
     var verticalLineIcon = element.getElementsByClassName("report-list-vl")[0];
 
-    while (nextTableRow.className !== "tr-next-day-separator"){
+    let expandReportTitle = "Expand report list"
+    if (element.getAttribute("title") === expandReportTitle) {
+        element.setAttribute("title", "Roll report list")
+    }
+    else {
+        element.setAttribute("title", expandReportTitle)
+    }
+
+    while (nextTableRow.className !== "tr-next-day-separator") {
         nextTableRow.classList.toggle("visible-hidden-report")
         nextTableRow = nextTableRow.nextElementSibling;
     }

employees/static/employees/scripts/modalsFunctionality.js

@@ -1,3 +1,10 @@
+const reportFormFieldsSelectorsMap = {
+    "project": "select[name=project]",
+    "taskActivity": "select[name=task_activity]",
+    "workHours": "input[name=work_hours]",
+    "description": "textarea[name=description]",
+};
+
 $(function() {
     $(".bs-modal").each(function () {
         $(this).modalForm({
@@ -26,8 +33,44 @@ $(function() {
         document.activeElement.blur();
     });
 
-    $("#modal").on('shown.bs.modal', function() {
+    $("#modal").on('show.bs.modal', function () {
+        let reportForm = $(this).find("form")
+        if (reportForm.attr("name") === "create-report-form") {
+            getFieldsValuesFromLocalStorage(reportForm);
+        }
+
+    }).on('shown.bs.modal', function() {
         $("body").removeClass("modal-open");
         $(".custom-modal").removeClass("modal");
+
+    }).on('hide.bs.modal', function() {
+        let reportForm = $(this).find("form")
+        if (reportForm.attr("name") === "create-report-form") {
+            storeReportFormValuesToLocalStorage(reportForm);
+        }
     });
+
+    resetLocalStorage();
 });
+
+function storeReportFormValuesToLocalStorage(form) {
+    var createReportFields = {}
+    for (let[formField, formFieldSelector] of Object.entries(reportFormFieldsSelectorsMap)) {
+        createReportFields[formField] = form.find(formFieldSelector).val()
+    }
+    localStorage.setItem("createReportFields", JSON.stringify(createReportFields));
+}
+
+function getFieldsValuesFromLocalStorage(form) {
+    if (localStorage.getItem("createReportFields") !== null) {
+        var storedCreateReportFields = JSON.parse(localStorage.getItem("createReportFields"));
+
+        for (let[formField, formFieldSelector] of Object.entries(reportFormFieldsSelectorsMap)) {
+            form.find(formFieldSelector).val(storedCreateReportFields[formField]);
+        }
+    }
+}
+
+function resetLocalStorage() {
+    localStorage.removeItem("createReportFields");
+}

employees/static/employees/style.css

@@ -417,11 +417,32 @@ table.table {
     margin: 0;
 }
 
+.alert-custom {
+    background-color: #d6e7f5;
+    color: #2768a5;
+}
+
+.alert-popup-top {
+    position: absolute;
+    z-index: 1000;
+    width: 78%;
+    margin-top: -38px;
+}
+
 @media (max-width: 995px) {
     .export-csv, .export-xlsx {
         text-align: center;
     }
 }
+
+@media (max-width: 890px) {
+    .alert-popup-top {
+        position: relative;
+        z-index: 0;
+        width: auto;
+        margin-top: auto;
+    }
+}
 @media (max-width: 769px) {
     .add-report-form-join-project-field {
         margin-left: 50px;

employees/templates/employees/author_report_list.html

@@ -27,6 +27,7 @@
         {{ UI_text.RETURN_BUTTON_MESSAGE.value }}
     </a>
     <div class="container main-white-container margin-top-space">
+        {% include "common/popup_message.html" %}
         {% include "employees/partial/modal_forms/modal_base.html" %}
         {% include "employees/partial/month_navigation/report_list_navigation_bar.html" %}
         {% include "employees/partial/display_reports/display_user_reports.html" with user=object reports=object.get_reports_created %}
@@ -46,4 +47,9 @@
         integrity="{% staticinline 'employees/scripts/modalsFunctionality.js' encode="sri" %}"
         crossorigin="anonymous">
     </script>
+    <script
+        src="{% static 'users/scripts/hidePopupMessage.js' %}"
+        integrity="{% staticinline 'users/scripts/hidePopupMessage.js' encode='sri' %}"
+        crossorigin="anonymous">
+    </script>
 {% endblock %}

employees/templates/employees/partial/modal_forms/create_and_update_report.html

@@ -1,7 +1,7 @@
 {% load crispy_forms_tags %}
 {% load static %}
 
-<form method="post" action="" data-task-activities-url="{% url 'ajax-load-task-activities' %}" id="reportForm">
+<form method="post" action="" data-task-activities-url="{% url 'ajax-load-task-activities' %}" id="reportForm" {% if is_create_report_form %} name="create-report-form" {% else %} name="update-report-form" {% endif %}>
     {% csrf_token %}
     <div class="modal-header margin-top-space">
         <img class="add-report-form-header-icon modal-title" alt="report icon" src="{% static 'users/images/grey/ico-05.png' %}"/>

employees/templates/employees/project_report_list.html

@@ -23,6 +23,7 @@
 
 {% block content %}
     <div class="container main-white-container margin-top-space">
+        {% include "common/popup_message.html" %}
         {% include "employees/partial/modal_forms/modal_base.html" %}
         {% include "employees/partial/month_navigation/report_list_navigation_bar.html" %}
         <h1>
@@ -53,4 +54,9 @@ <h1>
         integrity="{% staticinline 'employees/scripts/modalsFunctionality.js' encode="sri" %}"
         crossorigin="anonymous">
     </script>
+    <script
+        src="{% static 'users/scripts/hidePopupMessage.js' %}"
+        integrity="{% staticinline 'users/scripts/hidePopupMessage.js' encode='sri' %}"
+        crossorigin="anonymous">
+    </script>
 {% endblock %}

employees/templates/employees/report_list.html

@@ -30,6 +30,7 @@
 
 {% block content %}
     <div class="container main-white-container margin-top-space">
+        {% include "common/popup_message.html" %}
         {% include "employees/partial/modal_forms/modal_base.html" %}
         {% include "employees/partial/month_navigation/report_list_navigation_bar.html" %}
         {% include "employees/partial/display_reports/display_user_reports.html" with user=request.user reports=object_list %}
@@ -56,4 +57,9 @@
         integrity="{% staticinline 'employees/scripts/modalsFunctionality.js' encode="sri" %}"
         crossorigin="anonymous">
     </script>
+    <script
+        src="{% static 'users/scripts/hidePopupMessage.js' %}"
+        integrity="{% staticinline 'users/scripts/hidePopupMessage.js' encode='sri' %}"
+        crossorigin="anonymous">
+    </script>
 {% endblock %}