@dhyasama/totem-models 9.43.2 → 9.45.0
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.
- package/lib/Financials.js +12 -5
- package/package.json +1 -1
package/lib/Financials.js
CHANGED
|
@@ -166,7 +166,13 @@ module.exports = function(mongoose, config) {
|
|
|
166
166
|
submittedBy: { type: String, trim: true },
|
|
167
167
|
|
|
168
168
|
archivedOn: { type: Date, index: false },
|
|
169
|
-
|
|
169
|
+
archivedBy: { type: String, trim: true },
|
|
170
|
+
|
|
171
|
+
approvedOn: { type: Date, index: false },
|
|
172
|
+
approvedBy: { type: String, trim: true },
|
|
173
|
+
|
|
174
|
+
rejectedOn: { type: Date, index: false },
|
|
175
|
+
rejectedBy: { type: String, trim: true },
|
|
170
176
|
|
|
171
177
|
rejection: { type: String, trim: true },
|
|
172
178
|
|
|
@@ -829,8 +835,8 @@ module.exports = function(mongoose, config) {
|
|
|
829
835
|
|
|
830
836
|
var needsReview = snapshot.review;
|
|
831
837
|
var isSubmitted = snapshot.submittedOn;
|
|
832
|
-
var
|
|
833
|
-
var isRejected = snapshot.rejection;
|
|
838
|
+
var isApproved = snapshot.approvedOn;
|
|
839
|
+
var isRejected = snapshot.rejectedOn && snapshot.rejection;
|
|
834
840
|
var isArchived = snapshot.archivedOn;
|
|
835
841
|
var isOverdue = moment(new Date()).isAfter(moment(snapshot.dueOn));
|
|
836
842
|
|
|
@@ -842,10 +848,11 @@ module.exports = function(mongoose, config) {
|
|
|
842
848
|
}
|
|
843
849
|
|
|
844
850
|
if(!snapshot.uuid) snapshot.status = 'Completed'; // no uuid means the snapshot was created from the google sheet and should always be completed
|
|
845
|
-
else if(needsReview &&
|
|
851
|
+
else if(needsReview && isApproved) snapshot.status = 'Completed';
|
|
846
852
|
else if(!needsReview && isSubmitted) snapshot.status = 'Completed';
|
|
847
853
|
else if(isArchived) snapshot.status = 'Archived';
|
|
848
|
-
else if(needsReview && isSubmitted && !
|
|
854
|
+
else if(needsReview && isSubmitted && !isRejected) snapshot.status = 'In Review';
|
|
855
|
+
else if(needsReview && isSubmitted && isRejected) snapshot.status = 'Opened';
|
|
849
856
|
else if(isOverdue) snapshot.status = 'Overdue';
|
|
850
857
|
else if(isDelivered && isOpened) snapshot.status = 'Opened';
|
|
851
858
|
else if(isDelivered) snapshot.status = 'Delivered';
|