Merge pull request #1272 from jadmsaadaot/out-of-date

Fix status out of date calculation

Author: jadmsaadaot

epictrack-api/migrations/versions/11c04609c1b4_approved_date.py

@@ -0,0 +1,38 @@
+"""approved_date
+
+Revision ID: 11c04609c1b4
+Revises: 74e3f8a6b3c2
+Create Date: 2023-11-16 14:50:22.513022
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '11c04609c1b4'
+down_revision = '74e3f8a6b3c2'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('work_statuses', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('approved_date', sa.DateTime(timezone=True), nullable=True))
+
+    with op.batch_alter_table('work_statuses_history', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('approved_date', sa.DateTime(timezone=True), autoincrement=False, nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('work_statuses_history', schema=None) as batch_op:
+        batch_op.drop_column('approved_date')
+
+    with op.batch_alter_table('work_statuses', schema=None) as batch_op:
+        batch_op.drop_column('approved_date')
+
+    # ### end Alembic commands ###

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

@@ -35,6 +35,7 @@ class WorkStatus(BaseModelVersioned):
     work = relationship('Work', foreign_keys=[work_id], lazy='select')
     is_approved = Column(Boolean(), default=False, nullable=False)
     approved_by = Column(String(255), default=None, nullable=True)
+    approved_date = Column(DateTime(timezone=True), nullable=True)
 
     @classmethod
     def list_statuses_for_work_id(cls, work_id) -> List[WorkStatus]:

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

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Service to manage Work status."""
+from datetime import datetime
 from http import HTTPStatus
 from typing import Dict
 
@@ -70,6 +71,7 @@ def approve_work_status(cls, work_status):
 
         work_status.is_approved = True
         work_status.approved_by = TokenInfo.get_username()
+        work_status.approved_date = datetime.utcnow()
 
         work_status.save()
 

epictrack-web/src/components/workPlan/status/StatusView/index.tsx

@@ -6,6 +6,9 @@ import RecentStatus from "./RecentStatus";
 import { Box, Grid } from "@mui/material";
 import StatusHistory from "./StatusHistory";
 import WarningBox from "../../../shared/warningBox";
+import { dateUtils } from "../../../../utils";
+import moment from "moment";
+import { When } from "react-if";
 
 const StatusView = () => {
   const { statuses } = React.useContext(WorkplanContext);
@@ -15,32 +18,55 @@ const StatusView = () => {
     setShowStatusForm(true);
   };
 
+  const STATUS_DATE_THRESHOLD = 7;
+
+  const isStatusOutOfDate = () => {
+    const lastApprovedStatus = statuses.find((status) => status.is_approved);
+
+    if (!lastApprovedStatus) {
+      return false;
+    }
+
+    const daysAgo = moment().subtract(STATUS_DATE_THRESHOLD, "days");
+    const NDaysAgo = dateUtils.diff(
+      daysAgo.toLocaleString(),
+      lastApprovedStatus?.approved_date,
+      "days"
+    );
+
+    return NDaysAgo > 0;
+  };
+
   return (
     <>
-      {statuses.length === 0 && (
+      <When condition={statuses.length === 0}>
         <NoDataEver
           title="You don't have any Statuses yet"
           subTitle="Create your first Status"
           addNewButtonText="Add Status"
           onAddNewClickHandler={() => onAddButtonClickHandler()}
         />
-      )}
-      {statuses.length != 0 && !statuses[0].is_approved && (
+      </When>
+      <When condition={isStatusOutOfDate()}>
         <Box sx={{ paddingBottom: "16px" }}>
           <WarningBox
             title="The Work status is out of date"
             subTitle="Please provide an updated status"
             isTitleBold={true}
           />
         </Box>
-      )}
+      </When>
       <Grid container spacing={2}>
-        <Grid item xs={6}>
-          {statuses.length > 0 && <RecentStatus />}
-        </Grid>
-        <Grid item xs={6}>
-          {statuses.length > 1 && <StatusHistory />}
-        </Grid>
+        <When condition={statuses.length > 0}>
+          <Grid item xs={6}>
+            <RecentStatus />
+          </Grid>
+        </When>
+        <When condition={statuses.length > 1}>
+          <Grid item xs={6}>
+            <StatusHistory />
+          </Grid>
+        </When>
       </Grid>
     </>
   );

epictrack-web/src/models/status.ts

@@ -5,4 +5,5 @@ export interface Status {
   is_active: boolean;
   is_approved: boolean;
   approved_by?: string;
+  approved_date: string;
 }