Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Content/css/dockyard.css
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,13 @@ div.action-header {
right: -66px;
}

.jumptarget{
display: inline-block;
height: 50px;
margin-top: 84px;
max-width:500px;
}

.action-add-button-link {
padding: 25px 0 15px 0;
}
Expand Down
13 changes: 10 additions & 3 deletions Scripts/app/directives/Controls/ContainerTransition.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// <reference path="../../_all.ts" />
module dockyard.directives.containerTransition {
import ContainerTransitions = dockyard.model.ContainerTransitions;
import pca = dockyard.directives.paneConfigureAction;
import planEvents = dockyard.Fr8Events.Plan;
'use strict';

Expand All @@ -16,7 +17,8 @@ module dockyard.directives.containerTransition {
currentAction: model.ActivityDTO;
removeTransition: (index: number) => void;
PCA: directives.paneConfigureAction.IPaneConfigureActionController;
isDisabled:boolean;
isDisabled: boolean;
reconfigure: () => void;
}

//More detail on creating directives in TypeScript:
Expand All @@ -38,6 +40,10 @@ module dockyard.directives.containerTransition {

var planOptions = new Array<model.DropDownListItem>();

$scope.reconfigure = () => {
$scope.$emit(pca.MessageType[pca.MessageType.PaneConfigureAction_Reconfigure], new pca.ActionReconfigureEventArgs($scope.currentAction));
};

//let's load and keep all plans in cache
//TODO think about this - maybe we need to request data from PCA or PB
//this direct access will create unnecessary requests to server
Expand Down Expand Up @@ -297,7 +303,6 @@ module dockyard.directives.containerTransition {
template: warningMessageTemplate
});
}

return angular.noop;
};

Expand All @@ -311,6 +316,7 @@ module dockyard.directives.containerTransition {
transition.errorMessage = "";
processTransition(transition);
triggerChange();
$scope.reconfigure();
return angular.noop;
};

Expand Down Expand Up @@ -373,7 +379,8 @@ module dockyard.directives.containerTransition {
subPlan: '=',
field: '=',
currentAction: '=',
isDisabled: '='
isDisabled: '=',
change: '&'
}
};
}
Expand Down
1 change: 0 additions & 1 deletion Views/AngularTemplate/ConfigurationControl.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<!-- Textbox template -->
<div ng-if='field.type == "TextBox"'>
<label class='control-label' ng-if="field.label">{{::field.label}}</label>
{{plan.planState}}
<input type='text' ng-model='field.value' ng-model-options="{ updateOn: 'blur' }" ng-change="onChange(field)" ng-required='field.required'
data-field-name='{{::field.name}}' id='pca__txt__{{::field.name | validId}}' class='form-control form-control-focus'
name='pca__txt__{{::field.name | validId}}' stop-click-propagation>
Expand Down
2 changes: 1 addition & 1 deletion Views/AngularTemplate/PlanBuilder.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
current-action="envelope.activity" mode="mode" processing="isReConfiguring"></pane-configure-action>
</div>
</div>
<div class="jumptarget-wrapper" ng-if="envelope.jumpTargets.length > 0" style="display: inline-block; height: 50px; margin: 84px 10px 0 7px; width: 55px;">
<div class="jumptarget-wrapper jumptarget" ng-if="envelope.jumpTargets.length > 0">
<div class="action-arrow-right action-arrow-right-jumptarget"> </div>
<div ng-repeat="jumpTarget in envelope.jumpTargets" class="col-md-12">
<div class="action-arrow-right-{{jumpTarget.TransitionType}}"></div>
Expand Down
2 changes: 1 addition & 1 deletion terminalGoogle/Services/GoogleMTSFPlan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task PlanConfiguration()
await InitialPlanConfiguration();
await CreateAndConfigureGoogle("ga_admin@fr8.co");
await CreateAndConfigureJiraMessages();
await CreateAndConfigureSaveToJiraActivity("Fr8");
await CreateAndConfigureSaveToJiraActivity("fr8test");
await CreateAndConfigureSlackMessage("Created new jira issue for terminal submission: [jira issue key], [jira domain]/browse/[jira issue key]");
foreach (var channel in _slackChannels)
{
Expand Down