Add WaitUntil and followUpEvaluation

This commit is contained in:
Michael Lange 2018-05-03 12:17:06 -07:00
parent 940a5325c7
commit 825d7c4512
3 changed files with 15 additions and 2 deletions

View file

@ -79,4 +79,17 @@ export default Model.extend({
hasRescheduleEvents: computed('rescheduleEvents.length', 'nextAllocation', function() {
return this.get('rescheduleEvents.length') > 0 || this.get('nextAllocation');
}),
hasStoppedRescheduling: computed(
'nextAllocation',
'clientStatus',
'followUpEvaluation',
function() {
return (
!this.get('nextAllocation') &&
!this.get('followUpEvaluation') &&
this.get('clientStatus') === 'failed'
);
}
),
});

View file

@ -23,4 +23,6 @@ export default Model.extend({
job: belongsTo('job'),
modifyIndex: attr('number'),
waitUntil: attr('date'),
});

View file

@ -44,8 +44,6 @@ export default ApplicationSerializer.extend({
hash.NextAllocationID = hash.NextAllocation ? hash.NextAllocation : null;
hash.FollowUpEvaluationID = hash.FollowupEvalID ? hash.FollowupEvalID : null;
console.log(hash.FollowUpEvaluationID);
return this._super(typeHash, hash);
},
});