diff --git a/app/components/project/modals/contract.coffee b/app/components/project/modals/contract.coffee index 0a37430..e94864f 100644 --- a/app/components/project/modals/contract.coffee +++ b/app/components/project/modals/contract.coffee @@ -27,9 +27,9 @@ export default ModalBase.extend @set 'contract', DS.PromiseObject.create promise: new Ember.RSVP.Promise (resolve) -> contract = - generating_project: project.get('id') - identifier: project.get('identifier') contract_version: 'v1' + generating_project_identifier: project.get('identifier') + generating_project_name: project.get('name') instance_scope: project.get('instance_scope') workflow_groups: [] workflow_actions: [] @@ -48,7 +48,7 @@ export default ModalBase.extend offset_type: workflow_group.get('offset_type') offset_base: workflow_group.get('offset_base.identifier') || null # no undefined scenarios: workflow_group.get('project_scenarios').mapBy('identifier') - add_offset_to workflow_group_object, ['offset', 'duration', 'batch_element_threshold'], workflow_group + add_offset_to workflow_group_object, ['offset', 'duration'], workflow_group if is_batch_project add_offset_to workflow_group_object, 'batch_element_threshold', workflow_group contract.workflow_groups.push workflow_group_object @@ -71,7 +71,7 @@ export default ModalBase.extend workflow_action_definition.get('workflow_action_offsets').forEach (workflow_action_offset) -> workflow_action_definition_object.action_offsets ||= [] - offset_object = {} + offset_object = {scenario: workflow_action_offset.get('project_scenario.identifier')} if base_identifier = workflow_action_offset.get('base_workflow_action_definition.identifier') offset_object.base_workflow_action = base_identifier add_offset_to offset_object, 'offset', workflow_action_offset @@ -87,11 +87,11 @@ export default ModalBase.extend conditional_value: workflow_action_connection.get('conditional_base_value') workflow_action_definition_object.action_connections.push connection_object - workflow_action_definition.get('workflow_action_constraints').forEach (workflow_action_constraint) -> - workflow_action_definition_object.action_constraints ||= [] - workflow_action_definition_object.action_constraints.push - type: workflow_action_constraint.get('type') - base_workflow_action: workflow_action_constraint.get('constraint_workflow_action_definition.identifier') + #workflow_action_definition.get('workflow_action_constraints').forEach (workflow_action_constraint) -> + # workflow_action_definition_object.action_constraints ||= [] + # workflow_action_definition_object.action_constraints.push + # type: workflow_action_constraint.get('type') + # base_workflow_action: workflow_action_constraint.get('constraint_workflow_action_definition.identifier') project.get('project_scenarios').forEach (project_scenario) -> project_scenario_object = identifier: project_scenario.get('identifier')