#1642 & #1559

epictrack-api/migrations/versions/097d41841ba4_convert_staff_emails_to_lower_case.py

@@ -0,0 +1,43 @@
+"""Convert staff emails to lower case
+
+Revision ID: 097d41841ba4
+Revises: 65cb91595d6a
+Create Date: 2024-01-11 14:04:10.156478
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.sql import column, table
+
+
+# revision identifiers, used by Alembic.
+revision = '097d41841ba4'
+down_revision = '65cb91595d6a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    staff_table = table('staffs',
+        column('id', sa.Integer),
+		column('name', sa.String),
+		column('phone',sa.String),
+		column('email', sa.String),
+		column('is_active', sa.Boolean),
+		column('position_id', sa.Integer)
+    )
+
+    conn.execute(
+            staff_table.update()\
+                .values(email=sa.func.lower(staff_table.c.email))
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

epictrack-api/migrations/versions/52b37bc04925_merging_097d41841ba4_and_09a79ca8e8fd.py

@@ -0,0 +1,24 @@
+"""merging 097d41841ba4 and 09a79ca8e8fd
+
+Revision ID: 52b37bc04925
+Revises: 097d41841ba4, 09a79ca8e8fd
+Create Date: 2024-01-15 10:02:26.499111
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '52b37bc04925'
+down_revision = ('097d41841ba4', '09a79ca8e8fd')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

epictrack-api/src/api/models/work_status.py

@@ -14,7 +14,7 @@
 """Model to handle all operations related to WorkStatus."""
 from __future__ import annotations
 
-from typing import List, Dict
+from typing import Dict, List
 
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, desc
 from sqlalchemy.orm import relationship

epictrack-api/src/api/schemas/request/staff_request.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Staff resource's input validations"""
-from marshmallow import fields, validate
+from marshmallow import fields, pre_load, validate
 
 from api.schemas.validators import Phone
 
@@ -47,6 +47,13 @@ class StaffExistanceQueryParamSchema(RequestQueryParameterSchema):
         missing=None,
     )
 
+    @pre_load
+    def convert_email_to_lower(self, data, **kwargs):  # pylint: disable=unused-argument
+        """Converts staff email into lower case string"""
+        data = dict(data)
+        data["email"] = data["email"].lower()
+        return data
+
 
 class StaffByPositionsQueryParamSchema(BasicRequestQueryParameterSchema):
     """Staff by positions query parameter"""
@@ -88,10 +95,15 @@ class StaffBodyParameterSchema(RequestBodyParameterSchema):
     )
 
     is_active = fields.Boolean(
-        metadata={"description": "Active status of the staff"},
-        required=True
+        metadata={"description": "Active status of the staff"}, required=True
     )
 
+    @pre_load
+    def convert_email_to_lower(self, data, **kwargs):  # pylint: disable=unused-argument
+        """Converts staff email into lower case string"""
+        data["email"] = data["email"].lower()
+        return data
+
 
 class StaffEmailPathParameterSchema(RequestPathParameterSchema):
     """Staff email path parameter schema"""
@@ -101,3 +113,10 @@ class StaffEmailPathParameterSchema(RequestPathParameterSchema):
         validate=validate.Email(),
         required=True,
     )
+
+    @pre_load
+    def convert_email_to_lower(self, data, **kwargs):  # pylint: disable=unused-argument
+        """Converts staff email into lower case string"""
+        data = dict(data)
+        data["email"] = data["email"].lower()
+        return data

epictrack-api/src/api/schemas/request/task_request.py

@@ -87,8 +87,7 @@ class TaskBodyParameterSchema(RequestBodyParameterSchema):
 
     tips = fields.Str(
         metadata={"description": "Practical info on why/how to do the task"},
-        # validate=validate.Length(max=150),
-        required=True,
+        allow_none=True
     )
 
     number_of_days = fields.Int(

epictrack-api/src/api/schemas/request/work_request.py

@@ -172,7 +172,7 @@ class WorkTypeIdQueryParamSchema(RequestQueryParameterSchema):
         metadata={"description": "The id of the work type"},
         validate=validate.Range(min=1),
         load_default=None,
-        allow_none=True
+        allow_none=True,
     )
 
 
@@ -197,8 +197,7 @@ class WorkStatusParameterSchema(RequestBodyParameterSchema):
     )
 
     notes = fields.Str(
-        metadata={"description": "Notes for the work status "},
-        allow_none=True
+        metadata={"description": "Notes for the work status "}, allow_none=True
     )
 
     posted_date = fields.DateTime(
@@ -230,7 +229,8 @@ class WorkIssuesParameterSchema(RequestBodyParameterSchema):
     )
 
     expected_resolution_date = fields.DateTime(
-        metadata={"description": "Expected Resolution date for the issue"}, required=False
+        metadata={"description": "Expected Resolution date for the issue"},
+        required=False,
     )
 
     updates = fields.List(
@@ -252,15 +252,11 @@ class WorkIssuesUpdateSchema(WorkIssuesParameterSchema):
     updates = fields.List(
         fields.Dict(
             description=fields.Str(
-                metadata={"description": "Description of the update"},
-                required=True
-            ),
-            id=fields.Int(
-                metadata={"description": "ID of the update"},
-                required=True
+                metadata={"description": "Description of the update"}, required=True
             ),
+            id=fields.Int(metadata={"description": "ID of the update"}, required=True),
             metadata={"description": "List of updates for the issue with IDs"},
-            required=True
+            required=True,
         ),
         metadata={"description": "List of updates for the issue with IDs"},
         required=False,
@@ -278,6 +274,8 @@ class WorkNotesBodySchema(RequestBodyParameterSchema):
 
     note_type = fields.Str(
         metadata={"description": "Type of work status notes"},
-        validate=validate.OneOf(['status_notes', 'issue_notes']),  # Add your predefined types
+        validate=validate.OneOf(
+            ["status_notes", "issue_notes"]
+        ),  # Add your predefined types
         required=True,
     )

epictrack-api/src/api/services/staff.py

@@ -121,6 +121,7 @@ def import_staffs(cls, file: IO):
         username = TokenInfo.get_username()
         data["created_by"] = username
         data = data.to_dict("records")
+        data["email"] = data["email"].lower()
         db.session.bulk_insert_mappings(Staff, data)
         db.session.commit()
         return "Inserted successfully"

epictrack-api/src/api/services/task_template.py

@@ -14,6 +14,7 @@
 """Service to manage Task Templates."""
 from typing import IO, List
 
+import numpy as np
 import pandas as pd
 from flask import current_app
 from sqlalchemy.sql import exists
@@ -47,6 +48,8 @@ def create_task_template(cls, data: dict, template_file: IO) -> TaskTemplate:
                 {"responsibility_id": res.id},
                 regex=True,
             )
+        task_data = task_data.replace({np.nan: None})
+        task_data = task_data.replace({np.NaN: None})
         tasks = task_data.to_dict("records")
         cls.create_bulk_tasks(tasks)
         TaskTemplate.commit()

epictrack-web/src/components/workPlan/issues/IssuesForm.tsx

@@ -4,7 +4,11 @@ import * as yup from "yup";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { Box, FormControlLabel, Grid, Stack, Tooltip } from "@mui/material";
 import ControlledTextField from "../../shared/controlledInputComponents/ControlledTextField";
-import { ETFormLabelWithCharacterLimit, ETParagraph } from "../../shared";
+import {
+  ETFormLabel,
+  ETFormLabelWithCharacterLimit,
+  ETParagraph,
+} from "../../shared";
 import ControlledSwitch from "../../shared/controlledInputComponents/ControlledSwitch";
 import { IssuesContext } from "./IssuesContext";
 import { IconProps } from "../../icons/type";
@@ -151,11 +155,11 @@ const IssuesForm = () => {
             name="description"
             fullWidth
             size="small"
+            multiline
+            rows={4}
             inputProps={{
               maxLength: descriptionCharacterLimit,
             }}
-            multiline
-            rows={4}
           />
         </Grid>
         <Grid item xs={12}>

epictrack-web/src/components/workPlan/status/StatusForm.tsx

@@ -16,6 +16,7 @@ const schema = yup.object().shape({
   posted_date: yup.string().required("Date is required"),
   description: yup.string().required("Description is required"),
 });
+
 const CHARACTER_LIMIT = 500;
 
 const StatusForm = () => {