Skip to content

Settings Wizard Implemented. #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 27, 2016
Merged

Settings Wizard Implemented. #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a674a1
CHanges for setting wizard
srikanthv02 Sep 20, 2016
97f8f27
Resolved merge conflicts
srikanthv02 Sep 20, 2016
a7ed832
CHanges for setting wizard
srikanthv02 Sep 21, 2016
4d07d3e
UI Changes
srikanthv02 Sep 21, 2016
bd57e1a
Changes for settings wizard
srikanthv02 Sep 23, 2016
83e0a16
Setting wizard
srikanthv02 Sep 23, 2016
969f173
Completed Settings Wizard implementation
srikanthv02 Sep 27, 2016
171c4c3
Resetting the cmdb file
srikanthv02 Sep 27, 2016
ea2cb88
Changes for Setting Wizard
srikanthv02 Sep 27, 2016
82f6fc5
Disabled removed from org,bu and proj
srikanthv02 Sep 27, 2016
dc8ef9e
Redirecting to settings when seed data is freshly installed
srikanthv02 Sep 27, 2016
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: 5 additions & 2 deletions client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function workzoneFunct($scope, $rootScope) {
}
angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'workzone.instance', 'workzone.blueprint', 'workzone.orchestration', 'workzone.container', 'workzone.cloudFormation', 'workzone.azureARM', 'workzone.application', 'apis.workzone', 'workzone.factories'])
.controller('workzoneCtrl', ['$scope', '$rootScope', workzoneFunct])
.controller('workzoneTreeCtrl', ['$rootScope', '$scope', 'workzoneServices', 'workzoneEnvironment', '$timeout', 'modulePermission', function ($rootScope, $scope, workzoneServices, workzoneEnvironment, $timeout, modulePerms) {
.controller('workzoneTreeCtrl', ['$rootScope', '$scope', 'workzoneServices', 'workzoneEnvironment', '$timeout', 'modulePermission', '$window', function ($rootScope, $scope, workzoneServices, workzoneEnvironment, $timeout, modulePerms, $window) {
'use strict';
//For showing menu icon in menu over breadcrumb without position flickering during load
$scope.isLoading = true;
Expand Down Expand Up @@ -135,7 +135,10 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
$('[data-nodetype="env"]').eq(0).click();
}else{
if(modulePerms.settingsAccess()){
$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_CONFIGURE_SETTINGS');
$window.location.href="/private/index.html#ajax/Settings/Dashboard.html";

//$location.path('/private/index.html#ajax/Settings/Dashboard.html');
//$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_CONFIGURE_SETTINGS');
}
else{
$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_NO_SETTINGS_ACCESS');
Expand Down
44 changes: 22 additions & 22 deletions client/htmls/private/ajax/Settings/ConfigCMDB.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<form action="" id="configForm" autocomplete="off">
<div class="widget-box">
<div class="widget-header">
<h5 class="widget-title" style="color:#4e5964;">
<strong>ServiceNow CMDB Setting</strong>
</h5>
</div>
<div class="widget-body">
<div class="widget-main" style="min-height:300px;">
<div>
<section id="widget-grid" class="">
<div class="widget-box">
<div class="widget-header">
<h5 class="widget-title" style="color:#4e5964;">
<strong>ServiceNow CMDB Setting</strong>
</h5>
</div>
<div class="widget-body">
<div class="widget-main" style="min-height:300px;">
<div>
<section id="widget-grid" class="">
<!-- START ROW -->
<div class="row">
<div class="row">
<!-- Widget ID (each widget will need unique ID)-->
<div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
<div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
<!-- widget div-->
<div>
<div>
<!-- widget content -->
<div class="widget-body no-padding">
<div class="widget-body no-padding">
<div class="col-lg-6 col-md-6">
<label for="configname">Configuration Name:<span class="control-label redSpan">&nbsp;*</span></label>
<!-- <i class="icon-append fa fa-building"></i> -->
Expand Down Expand Up @@ -90,12 +90,12 @@ <h5 class="widget-title" style="color:#4e5964;">
</div>
</div>

</div>
</div>
</div>
</div>
</form><!--form ends-->
</div>
</div>
</div>
</div>
</div>
</div>

<script >

Expand Down
206 changes: 160 additions & 46 deletions client/htmls/private/ajax/Settings/CreateDockerTemplates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,31 @@ <h4 class="widget-margin" style="color:black;">New Docker <span id="spndocker">
<label for="">Password: <span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="dockerpassword" class="form-control" type="text" cdata="catalyst" cat-validation="required" value="*********">
</div>
<div class="col-lg-6 col-md-6 smart-form margintop20">
<label for="category">Assign Projects:</label>
<div id="projectname" multiselect="multiselect" datatype="select" class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst">
</div>
</div>
<div class="col-lg-6 col-md-6">
<a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
<label style="float:left;margin-top:20px;">Repositories Details :</label>
<div class="table-responsive table-div">
<table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
<thead>
<tr class="rowCustomStyle" style="font-weight:bold;">
<td style="color:#fff;background-color: #2c3742;">Name</td>
<td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
</tr>
</thead>
<tbody id="repoDeployTbody">
</tbody>
</table>
</div>
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
<label for="name">Repository Details:</label>
<input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text" cdata="catalyst">
</div>
</div>
<!-- end widget content -->
</div>
Expand Down Expand Up @@ -78,61 +103,136 @@ <h4 class="widget-margin" style="color:black;">New Docker <span id="spndocker">
</div>
</div>
<!--row ends here-->

<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
<form class="" id="repoDetailsCreate" autocomplete="off">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">
<img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
</h4>
</div>
<div class="modal-body" style="height:150px;">
<div class="col-lg-6 col-md-6">
<label for="">Repository Name:<span style="color:red">*</span>
<span>
<img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
</img>
</span>
</label>
<select id="repoNameCreate" name="" class="form-control">
<option value="">Choose Repository</option>
</select>
</div>
</div>
<div class="modal-footer">
<a type="button" class="btn btn-default" data-dismiss="modal">
<i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
</a>
<button class="btn btn-primary btn-mini" id="saveRepoDetails">
<i class="ace-icon fa fa-check bigger-110"></i>
Save
</button>
</div>
</form>
</div>
</div>
</div>
<!--Popup for selecting a cloud provider before proceeding-->
<script>
$('#dockerrepoanchorDetails').click(function(e) {
$("#dockerrepodetailsModal").show();
$('#dockerrepoDetailsCreate').trigger("reset");
});
if (!$.fn.dataTable.isDataTable('#tabledockerrepositoryDetails')) {
$repoDetails = $('#tabledockerrepositoryDetails').DataTable({
"pagingType": "full_numbers",
"iDisplayLength": 5,
"aLengthMenu": [
[5, 40, 100, -1],
[5, 40, 100, "All"]
],
"aoColumns": [{
"bSortable": true
}, {
"bSortable": true
}]
});
}
$("#tabledockerrepositoryDetails_length").hide();
$("#tabledockerrepositoryDetails_filter").hide();

$("#savedockerRepoDetails").click(function(e) {
e.preventDefault();
var repoName = $("#dockerrepoNameCreate").val();
var regExpSymbol = new RegExp("/");
if (repoName == '') {
alert("Please Enter Docker Repository Name");
} else if (repoName != '' && repoName.match(regExpSymbol)) {
var $repoDeployTbody = $('#dockerrepoDeployTbody');
var $tr = $('<tr class="dockerrepoDetailsRow"></tr>');
var $tdName = $('<td class="tddockerrepoName" value=' + repoName + ' style="word-break: break-word;"></td>');
$tr.attr('dockerrepoName', repoName);


$tdName.append(repoName);
var $tdAction = $('<td/>');
$tdAction.append('<div style="margin-right:17px;float:right;" class="btn-group"><button class="deleteRow" value="Remove" title="Remove"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');

$tdAction.find('.deleteRow').click(function() {
$repoDetails.row($tr).remove().draw(true);
});

if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
$repoDetails = $('#tablerepositoryDetails').DataTable({
"pagingType": "full_numbers",
"iDisplayLength": 5,
"aLengthMenu": [
[5, 40, 100, -1],
[5, 40, 100, "All"]
],
"aoColumns": [
{
"bSortable": true
}, {
"bSortable": true
}
]
});
}
$("#tablerepositoryDetails_length").hide();
$("#tablerepositoryDetails_filter").hide();

$tr.append($tdName).append($tdAction);
$repoDeployTbody.append($tr);
$repoDetails.row.add($tr).draw();
$("#dockerrepodetailsModal").hide();
} else {
bootbox.alert("Please Enter Correct Format of the Docker Repository Name");
}
$('#repoanchorDetails').click(function(e){
getDockerRepositories();
});

function getDockerRepositories(){
$('.reposerverspinner').css('display', 'inline-block');
$('#repoNameCreate').select2('destroy').empty();
$('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
$.get('/d4dMasters/readmasterjsonnew/17',function(templates){
if(templates.length){
$('.reposerverspinner').css('display', 'none');
for(var i=0; i< templates.length; i++){
if(templates[i].dockercontainerpaths){
$('#repoNameCreate').append('<option value='+templates[i].dockercontainerpaths+'>'+templates[i].dockercontainerpaths+'</option>');
}
}
} else {
$('.reposerverspinner').css('display', 'none');
}
});
}

$("#saveRepoDetails").click(function(e) {

e.preventDefault();
var repoServerName = $("#chooseRepoServer").val();
var repoName = $("#repoNameCreate").val();
if (repoName == '') {
alert("Please enter Repository Name");
}
if (repoName != '') {
var $repoDeployTbody = $('#repoDeployTbody');
var $tr = $('<tr class="repoDetailsRow"></tr>');
var $tdName = $('<td class="tdrepoName" value=' + repoName + ' style="word-break: break-word;"></td>');
$tr.data('repoName', repoName);

$tdName.append(repoName);
var $tdAction = $('<td/>');
$tdAction.append('<div style="margin-right:17px;float:right;" class="btn-group"><button class="deleteRow" value="Remove" title="Remove"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');

$tdAction.find('.deleteRow').click(function() {
$repoDetails.row($tr).remove().draw(true);
});

$tr.append($tdName).append($tdAction);
$repoDeployTbody.append($tr);
$repoDetails.row.add($tr).draw();
$("#repodetailsModal").hide();
}
$("#repoNameCreate").empty();
$('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
});

$("#savecreateDockerbtn").click(function(e) {
var repositories = {
docker: []
};
var dockerList = [];
var tableData = $repoDetails.data();
for(var i=0; i< tableData.length;i++){
dockerList.push(tableData[i][0]);
}
repositories.docker = dockerList;
$('#repositories').val(JSON.stringify(repositories));
});
//Form Name
function cancelClicked() {
$("#popupSelectProvider").modal('hide');
Expand Down Expand Up @@ -167,6 +267,20 @@ <h4 class="widget-margin" style="color:black;">New Docker <span id="spndocker">

}

$('#orgname').change(function() {
$('#projectname').empty();
$.get('/d4dMasters/readmasterjsonnew/4', function(data) {
for (var i = 0; i < data.length; i++) {
var str = '',
getTemplate = function(val, rowid) {
return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' +'value="'+ val +'"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
};
str = str + getTemplate(data[i].projectname, data[i].rowid);
$('#projectname').append(str);
}
});
});

function inLineReady() {

$("input[type='text']").on("click", function() {
Expand Down
Loading