Change partly received to partially received

HackGT · Jul 23, 2020 · eb3d9ef · eb3d9ef
1 parent 8f33493
commit eb3d9ef
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 13 deletions.
diff --git a/expenses/migrations/0027_auto_20200720_1213.py b/expenses/migrations/0027_auto_20200720_1213.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-07-20 16:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('expenses', '0026_auto_20200715_2306'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='requisition',
+            name='status',
+            field=models.CharField(choices=[('Draft', 'Draft'), ('Submitted', 'Submitted'), ('Pending Changes', 'Pending Changes'), ('Ready to Order', 'Ready to Order'), ('Ordered', 'Ordered'), ('Partially Received', 'Partially Received'), ('Received', 'Received'), ('Closed', 'Closed'), ('Cancelled', 'Cancelled')], default='Draft', max_length=50),
+        ),
+    ]
diff --git a/expenses/models.py b/expenses/models.py
@@ -24,7 +24,7 @@ class RequisitionStatus(models.Model):
     PENDING_CHANGES = "Pending Changes"
     READY_TO_ORDER = "Ready to Order"
     ORDERED = "Ordered"
-    PARTLY_RECEIVED = "Partly Received"
+    PARTIALLY_RECEIVED = "Partially Received"
     RECEIVED = "Received"
     CLOSED = "Closed"
     CANCELLED = "Cancelled"
@@ -34,7 +34,7 @@ class RequisitionStatus(models.Model):
                (PENDING_CHANGES, PENDING_CHANGES),
                (READY_TO_ORDER, READY_TO_ORDER),
                (ORDERED, ORDERED),
-               (PARTLY_RECEIVED, PARTLY_RECEIVED),
+               (PARTIALLY_RECEIVED, PARTIALLY_RECEIVED),
                (RECEIVED, RECEIVED),
                (CLOSED, CLOSED),
                (CANCELLED, CANCELLED)

diff --git a/frontend/src/components/requisitionDetail/sections/ItemsTableSection.tsx b/frontend/src/components/requisitionDetail/sections/ItemsTableSection.tsx
@@ -10,6 +10,10 @@ type RequisitionItemRow = RequisitionItem & { isNotesRow: boolean }
 
 const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
   const { data, loading } = props;
+
+  // Boolean determines whether to show green highlights and table footer
+  const showReceived = data.status === "PARTIALLY_RECEIVED";
+  const greenColor = "#f6ffed";
 
   const columns = [
     {
@@ -21,7 +25,7 @@ const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
             children: <Text>{record.notes}</Text>,
             props: {
               colSpan: 3,
-              style: { background: record.received && data.status === "PARTLY_RECEIVED" ? "#f6ffed" : "" }
+              style: { background: record.received && showReceived ? greenColor : "" }
             }
           };
         }
@@ -31,7 +35,7 @@ const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
         return {
           children: <Link href={record.link} target="_blank">{record.name}</Link>,
           props: {
-            style: { background: record.received && data.status === "PARTLY_RECEIVED" ? "#f6ffed" : "" }
+            style: { background: record.received && showReceived ? greenColor : "" }
           }
         };
       }
@@ -52,7 +56,7 @@ const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
         return {
           children: `${record.quantity} @ ${formatPrice(record.unitPrice)}`,
           props: {
-            style: { background: record.received && data.status === "PARTLY_RECEIVED" ? "#f6ffed" : "" }
+            style: { background: record.received && showReceived ? greenColor : "" }
           }
         };
       }
@@ -70,7 +74,7 @@ const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
         return {
           children: formatPrice(record.quantity * record.unitPrice),
           props: {
-            style: { background: record.received && data.status === "PARTLY_RECEIVED" ? "#f6ffed" : "" }
+            style: { background: record.received && showReceived ? greenColor : "" }
           }
         };
       }
@@ -94,7 +98,7 @@ const ItemsTableSection: React.FC<RequisitionSectionProps> = (props) => {
       size="small"
       bordered
       scroll={{ x: true }}
-      footer={data.status === "PARTLY_RECEIVED" ? () => <em>* Items in green have been received</em> : undefined}
+      footer={showReceived ? () => <em>* Items in green have been received</em> : undefined}
       summary={() => (loading ? null
         : (
           <>

diff --git a/frontend/src/components/requisitionDetail/sections/ManageStatusSection.tsx b/frontend/src/components/requisitionDetail/sections/ManageStatusSection.tsx
@@ -44,7 +44,7 @@ const ManageStatusSection: React.FC<RequisitionSectionProps> = (props) => {
       case "READY_TO_ORDER":
         return <ReadyToOrderExpense requisition={data} />;
       case "ORDERED":
-      case "PARTLY_RECEIVED":
+      case "PARTIALLY_RECEIVED":
         return <OrderedExpense requisition={data} />;
       case "RECEIVED":
         return <ReceivedExpense requisition={data} />;

diff --git a/frontend/src/components/requisitionDetail/sections/expenseRows/OrderedExpense.tsx b/frontend/src/components/requisitionDetail/sections/expenseRows/OrderedExpense.tsx
@@ -19,7 +19,7 @@ const OrderedExpense: React.FC<RequisitionExpenseSectionProps> = (props) => {
     } else if (numReceived === Object.keys(values).length) {
       status = "RECEIVED";
     } else {
-      status = "PARTLY_RECEIVED";
+      status = "PARTIALLY_RECEIVED";
     }
 
     const mutationData = {

diff --git a/frontend/src/types/Requisition.ts b/frontend/src/types/Requisition.ts
@@ -12,7 +12,7 @@ export type RequisitionStatus =
   "PENDING_CHANGES" |
   "READY_TO_ORDER" |
   "ORDERED" |
-  "PARTLY_RECEIVED" |
+  "PARTIALLY_RECEIVED" |
   "RECEIVED" |
   "CLOSED" |
   "CANCELLED";

diff --git a/frontend/src/util/util.ts b/frontend/src/util/util.ts
@@ -11,7 +11,7 @@ export const StatusToColor = (status: RequisitionStatus): PresetColorType | unde
     case "PENDING_CHANGES": return "orange";
     case "READY_TO_ORDER": return "green";
     case "ORDERED": return "blue";
-    case "PARTLY_RECEIVED": return "purple";
+    case "PARTIALLY_RECEIVED": return "purple";
     case "RECEIVED": return "purple";
     case "CLOSED": return undefined;
     case "CANCELLED": return "red";
@@ -26,7 +26,7 @@ export const StatusToString = (status: RequisitionStatus) => {
     case "PENDING_CHANGES": return "Pending Changes";
     case "READY_TO_ORDER": return "Ready to Order";
     case "ORDERED": return "Ordered";
-    case "PARTLY_RECEIVED": return "Partly Received";
+    case "PARTIALLY_RECEIVED": return "Partially Received";
     case "RECEIVED": return "Received";
     case "CLOSED": return "Closed";
     case "CANCELLED": return "Cancelled";
@@ -41,7 +41,7 @@ export const StatusToStep = (status: RequisitionStatus) => {
     case "PENDING_CHANGES": return 0;
     case "READY_TO_ORDER": return 2;
     case "ORDERED": return 3;
-    case "PARTLY_RECEIVED": return 3;
+    case "PARTIALLY_RECEIVED": return 3;
     case "RECEIVED": return 4;
     case "CLOSED": return 5;
     case "CANCELLED": return -1;