zou 0.20.46__tar.gz → 0.20.48__tar.gz

{zou-0.20.46/zou.egg-info → zou-0.20.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.46
+Version: 0.20.48
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-0.20.48/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.20.48"

{zou-0.20.46 → zou-0.20.48}/zou/app/blueprints/projects/resources.py

@@ -1509,20 +1509,20 @@ class ProductionMonthTimeSpentsResource(Resource, ArgsMixin):
         - Projects
         parameters:
         - in: path
-            name: project_id
-            required: True
-            type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          name: project_id
+          required: True
+          type: string
+          format: UUID
+          x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
-            200:
-                description: Aggregated time spents for given person and month
-            400:
-                description: Wrong ID format
+          200:
+              description: Aggregated time spents for given person and month
+          400:
+              description: Wrong ID format
         """
         permissions.check_admin_permissions()
         self.check_id_parameter(project_id)
         user = persons_service.get_current_user()
         return time_spents_service.get_project_month_time_spents(
             project_id, user["timezone"]
-        )
+        )

{zou-0.20.46 → zou-0.20.48}/zou/app/services/time_spents_service.py

@@ -545,8 +545,7 @@ def get_project_month_time_spents(project_id, timezone=None):
     """
     data = {}
     query = (
-        TimeSpent.query
-        .join(Task)
+        TimeSpent.query.join(Task)
         .join(TaskType, TaskType.id == Task.task_type_id)
         .join(Department, Department.id == TaskType.department_id)
         .filter(Task.project_id == project_id)
@@ -559,15 +558,17 @@ def get_project_month_time_spents(project_id, timezone=None):
             time_spent.date, timezone
         )[0:7]
         if department_id not in data:
-            data[department_id] = { "total": 0 }
+            data[department_id] = {"total": 0}
         if time_spent.person_id not in data[department_id]:
-            data[department_id][time_spent.person_id] = { "total": 0 }
+            data[department_id][time_spent.person_id] = {"total": 0}
         if date_key not in data[department_id][time_spent.person_id]:
             data[department_id][time_spent.person_id][date_key] = 0
 
-        data[department_id][time_spent.person_id][date_key] += \
-            time_spent.duration
+        data[department_id][time_spent.person_id][
+            date_key
+        ] += time_spent.duration
         data[department_id]["total"] += time_spent.duration
-        data[department_id][time_spent.person_id]["total"] += \
-            time_spent.duration
-    return data
+        data[department_id][time_spent.person_id][
+            "total"
+        ] += time_spent.duration
+    return data

{zou-0.20.46 → zou-0.20.48}/zou/migrations/versions/d80f02824047_add_plugin_revision.py

@@ -8,6 +8,12 @@ Create Date: 2025-05-02 16:08:57.078114
 
 from alembic import op
 import sqlalchemy as sa
+from alembic import op
+import sqlalchemy as sa
+from zou.migrations.utils.base import BaseMixin
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm.session import Session
 
 
 # revision identifiers, used by Alembic.
@@ -16,6 +22,37 @@ down_revision = "e7e633bd6fa2"
 branch_labels = None
 depends_on = None
 
+base = declarative_base()
+
+
+class Task(base, BaseMixin):
+    """
+    Describes a task done by a CG artist on an entity of the CG production.
+    The task has a state and assigned to people. It handles notion of time like
+    duration, start date and end date.
+    """
+
+    __tablename__ = "task"
+    name = sa.Column(sa.String(80), nullable=False)
+    description = sa.Column(sa.Text())
+
+    priority = sa.Column(sa.Integer, default=0)
+    difficulty = sa.Column(sa.Integer, default=3, nullable=False)
+    duration = sa.Column(sa.Float, default=0)
+    estimation = sa.Column(sa.Float, default=0)
+    completion_rate = sa.Column(sa.Integer, default=0)
+    retake_count = sa.Column(sa.Integer, default=0)
+    sort_order = sa.Column(sa.Integer, default=0)
+    start_date = sa.Column(sa.DateTime)
+    due_date = sa.Column(sa.DateTime)
+    real_start_date = sa.Column(sa.DateTime)
+    end_date = sa.Column(sa.DateTime)
+    done_date = sa.Column(sa.DateTime)
+    last_comment_date = sa.Column(sa.DateTime)
+    nb_assets_ready = sa.Column(sa.Integer, default=0)
+    data = sa.Column(JSONB)
+    nb_drawings = sa.Column(sa.Integer, default=0)
+
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
@@ -33,6 +70,13 @@ def upgrade():
         )
 
     with op.batch_alter_table("task", schema=None) as batch_op:
+        session = Session(bind=op.get_bind())
+        session.query(Task).where(Task.difficulty == None).update(
+            {
+                Task.difficulty: 3,
+            }
+        )
+        session.commit()
         batch_op.alter_column(
             "difficulty",
             existing_type=sa.INTEGER(),

{zou-0.20.46 → zou-0.20.48}/zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py

@@ -32,8 +32,6 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("task", schema=None) as batch_op:
-        batch_op.alter_column(
-            "difficulty", existing_type=sa.INTEGER(), nullable=True
-        )
+    with op.batch_alter_table("budget_entry", schema=None) as batch_op:
+        batch_op.drop_column("exceptions")
     # ### end Alembic commands ###

{zou-0.20.46 → zou-0.20.48/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.46
+Version: 0.20.48
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-0.20.46/zou/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.20.46"