Merge branch 'develop' into 'master'

Develop

See merge request 2020-2021/online/s101/group-02/access_controller!101

access_controller/settings.py

@@ -192,7 +192,10 @@ REST_FRAMEWORK = {
     ]
 }
 
-ONE_DAY = int(os.getenv('SHIFTH', '0'))  # Количество часов в 1 рабочем дне
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+ONE_DAY = int(os.getenv('SHIFTH', 0))  # Количество часов в 1 рабочем дне
 
 ACTRL_ZENDESK_SUBDOMAIN = os.getenv('ACTRL_ZENDESK_SUBDOMAIN') or os.getenv('ZD_DOMAIN')
 ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_API_EMAIL')

documentation.sh

@@ -19,5 +19,5 @@ retry() {
 }
 
 m2r README.md --overwrite
-sphinx-build -b html docs/source build/webserver/docs
+retry 10 sphinx-build -b html docs/source build/webserver/docs
 rm README.rst

main/control_page_js_modules/package-lock.json

@@ -1915,10 +1915,12 @@
       }
     },
     "@webpack-cli/configtest": {
+
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
       "dev": true
+
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -1930,10 +1932,12 @@
       }
     },
     "@webpack-cli/serve": {
+
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
       "dev": true
+
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",

main/migrations/0018_auto_20210522_2331.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.3 on 2021-05-22 20:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0017_auto_20210408_1943'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='unassignedticket',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

main/migrations/0020_merge_0018_auto_20210522_2331_0019_auto_20210527_1935.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.3 on 2021-05-29 22:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0018_auto_20210522_2331'),
+        ('main', '0019_auto_20210527_1935'),
+    ]
+
+    operations = [
+    ]

main/statistic_data.py

@@ -151,17 +151,16 @@ class StatisticData:
             return stat
         new_stat = {}
         if self.interval == 'months':
-            # Переделываем ключи под формат('начало_месяца - конец_месяца')
             for key, value in stat.items():
                 current_month_start = max(self.start_date, date(year=key.year, month=key.month, day=1))
                 current_month_end = min(self.end_date, last_day_of_month(date(year=key.year, month=key.month, day=1)))
-                index = ' - '.join([str(current_month_start), str(current_month_end)])
+                index = (current_month_start, current_month_end)
                 if new_stat.get(index):
                     new_stat[index] += value
                 else:
                     new_stat[index] = value
         elif self.interval == 'days':
-            new_stat = stat  # статистика изначально в днях
+            new_stat = stat
         return new_stat
 
     def check_time(self) -> bool:
@@ -240,7 +239,8 @@ class StatisticData:
         :param last_log: Последний лог изменения роли, в результате которого пользователь назначен инженером.
         :return: Дополняет статистику работы
         """
-        self.fill_daterange(last_log.change_time.date() + timedelta(days=1), self.end_date + timedelta(days=1))
+        self.fill_daterange(last_log.change_time.date() + timedelta(days=1),
+                            min(self.end_date, timezone.now().date()) + timedelta(days=1))
         if last_log.change_time.date() == timezone.now().date():
             self.statistic[last_log.change_time.date()] += (
                 get_timedelta(None, timezone.now().time()) - get_timedelta(last_log)

main/templates/pages/statistic.html

@@ -91,7 +91,7 @@
         {% if interval == 'days' %}
           <td scope="col">{{ date | date:'d.m' }}</td>
         {% else %}
-        <td scope="col">{{ date.1 | date:'F'  }}</td>
+        <td scope="col">{{ date.0 | date:'d F'  }} - {{ date.1 | date:'d F'  }}</td>
         {% endif %}
         {% endfor %}
       </tr>

main/templates/pages/work.html

@@ -70,8 +70,10 @@
       </div>
     </div>
 
-    <form class="row g-3 align-items-center" method="POST" action="{% url 'work_get_tickets' %}">
-     {% csrf_token %}
+
+
+    <form class="row g-3 align-items-center" method="post" action="/work/get_tickets">
+      {% csrf_token %}
       <div class="col-2">
         <input class="form-control" type="number" min="1" value="1" name="count_tickets">
       </div>