zou 0.20.47__py3-none-any.whl → 0.20.48__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- zou/__init__.py +1 -1
- zou/app/blueprints/projects/resources.py +10 -10
- zou/app/services/time_spents_service.py +10 -9
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/METADATA +1 -1
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/RECORD +9 -9
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/WHEEL +0 -0
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/entry_points.txt +0 -0
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/licenses/LICENSE +0 -0
- {zou-0.20.47.dist-info → zou-0.20.48.dist-info}/top_level.txt +0 -0
zou/__init__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "0.20.
|
|
1
|
+
__version__ = "0.20.48"
|
|
@@ -1509,20 +1509,20 @@ class ProductionMonthTimeSpentsResource(Resource, ArgsMixin):
|
|
|
1509
1509
|
- Projects
|
|
1510
1510
|
parameters:
|
|
1511
1511
|
- in: path
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
|
|
1515
|
-
|
|
1516
|
-
|
|
1512
|
+
name: project_id
|
|
1513
|
+
required: True
|
|
1514
|
+
type: string
|
|
1515
|
+
format: UUID
|
|
1516
|
+
x-example: a24a6ea4-ce75-4665-a070-57453082c25
|
|
1517
1517
|
responses:
|
|
1518
|
-
|
|
1519
|
-
|
|
1520
|
-
|
|
1521
|
-
|
|
1518
|
+
200:
|
|
1519
|
+
description: Aggregated time spents for given person and month
|
|
1520
|
+
400:
|
|
1521
|
+
description: Wrong ID format
|
|
1522
1522
|
"""
|
|
1523
1523
|
permissions.check_admin_permissions()
|
|
1524
1524
|
self.check_id_parameter(project_id)
|
|
1525
1525
|
user = persons_service.get_current_user()
|
|
1526
1526
|
return time_spents_service.get_project_month_time_spents(
|
|
1527
1527
|
project_id, user["timezone"]
|
|
1528
|
-
)
|
|
1528
|
+
)
|
|
@@ -545,8 +545,7 @@ def get_project_month_time_spents(project_id, timezone=None):
|
|
|
545
545
|
"""
|
|
546
546
|
data = {}
|
|
547
547
|
query = (
|
|
548
|
-
TimeSpent.query
|
|
549
|
-
.join(Task)
|
|
548
|
+
TimeSpent.query.join(Task)
|
|
550
549
|
.join(TaskType, TaskType.id == Task.task_type_id)
|
|
551
550
|
.join(Department, Department.id == TaskType.department_id)
|
|
552
551
|
.filter(Task.project_id == project_id)
|
|
@@ -559,15 +558,17 @@ def get_project_month_time_spents(project_id, timezone=None):
|
|
|
559
558
|
time_spent.date, timezone
|
|
560
559
|
)[0:7]
|
|
561
560
|
if department_id not in data:
|
|
562
|
-
data[department_id] = {
|
|
561
|
+
data[department_id] = {"total": 0}
|
|
563
562
|
if time_spent.person_id not in data[department_id]:
|
|
564
|
-
data[department_id][time_spent.person_id] = {
|
|
563
|
+
data[department_id][time_spent.person_id] = {"total": 0}
|
|
565
564
|
if date_key not in data[department_id][time_spent.person_id]:
|
|
566
565
|
data[department_id][time_spent.person_id][date_key] = 0
|
|
567
566
|
|
|
568
|
-
data[department_id][time_spent.person_id][
|
|
569
|
-
|
|
567
|
+
data[department_id][time_spent.person_id][
|
|
568
|
+
date_key
|
|
569
|
+
] += time_spent.duration
|
|
570
570
|
data[department_id]["total"] += time_spent.duration
|
|
571
|
-
data[department_id][time_spent.person_id][
|
|
572
|
-
|
|
573
|
-
|
|
571
|
+
data[department_id][time_spent.person_id][
|
|
572
|
+
"total"
|
|
573
|
+
] += time_spent.duration
|
|
574
|
+
return data
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
zou/__init__.py,sha256=
|
|
1
|
+
zou/__init__.py,sha256=RQqWrS8U7caHh_fxxsIrLsmJXWIM0hPnKDjsOfhUWfg,24
|
|
2
2
|
zou/cli.py,sha256=8YdBqJKEulAZ_1ohTdmpt_lf8EMjDmYiH8l0jVNlfG0,22397
|
|
3
3
|
zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
|
|
4
4
|
zou/event_stream.py,sha256=yTU1Z3r55SiYm8Y5twtJIo5kTnhbBK-XKc8apdgvzNw,8291
|
|
@@ -97,7 +97,7 @@ zou/app/blueprints/playlists/resources.py,sha256=mF3gmlWpe9YKyyKVRUXYtvTCk7OguWI
|
|
|
97
97
|
zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
|
|
98
98
|
zou/app/blueprints/previews/resources.py,sha256=uyjfW3vyE2a1PPXO8MsHP8-3jhuVKHt3oi2pYsq-ZIw,53376
|
|
99
99
|
zou/app/blueprints/projects/__init__.py,sha256=KhzIn5HvemfvsP5yJBMImdsEuTA_P806kRpoNbAdfIs,4643
|
|
100
|
-
zou/app/blueprints/projects/resources.py,sha256=
|
|
100
|
+
zou/app/blueprints/projects/resources.py,sha256=Z0UfzCzP9n8YBIH4_2cFaP9tIHCn-jQI7NqtQouCTiY,44938
|
|
101
101
|
zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
|
|
102
102
|
zou/app/blueprints/search/resources.py,sha256=_QgRlUuxCPgY-ip5r2lGFtXNcGSE579JsCSrVf8ajVU,3093
|
|
103
103
|
zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
|
|
@@ -222,7 +222,7 @@ zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_
|
|
|
222
222
|
zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
|
|
223
223
|
zou/app/services/tasks_service.py,sha256=D-u-8W3rIg00Nqp7MuG1WSOcPANE4XXliKpVwm5NbVU,69815
|
|
224
224
|
zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
|
|
225
|
-
zou/app/services/time_spents_service.py,sha256=
|
|
225
|
+
zou/app/services/time_spents_service.py,sha256=8sYnepgeo4yohNFRNiEedqFfL2vuJ78GZSHOpRmp52Q,16502
|
|
226
226
|
zou/app/services/user_service.py,sha256=rvo_e_JkPdTqIOE3FETXlUXnuS8n0lLyovTpwApyt8I,51470
|
|
227
227
|
zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
228
228
|
zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
|
|
@@ -446,9 +446,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
|
|
|
446
446
|
zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
|
|
447
447
|
zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
448
448
|
zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
|
|
449
|
-
zou-0.20.
|
|
450
|
-
zou-0.20.
|
|
451
|
-
zou-0.20.
|
|
452
|
-
zou-0.20.
|
|
453
|
-
zou-0.20.
|
|
454
|
-
zou-0.20.
|
|
449
|
+
zou-0.20.48.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
|
|
450
|
+
zou-0.20.48.dist-info/METADATA,sha256=WWbxBdmkfb6nCdb7rZmnEcINwUPa6MHqAoLGXhPppi0,6826
|
|
451
|
+
zou-0.20.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
452
|
+
zou-0.20.48.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
|
|
453
|
+
zou-0.20.48.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
|
|
454
|
+
zou-0.20.48.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|