Skip to content

Added name field and fixed update issue #861

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 24 commits into from
Oct 26, 2016
Merged

Added name field and fixed update issue #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f589080
fix to avoid duplicate resource cost entries adding up to total cost
Oct 5, 2016
90a6e3d
Merge pull request #798 from kkn/topic-cloud-analytics
liteverge-bot Oct 5, 2016
d393d5d
Merge remote-tracking branch 'upstream/dev' into analytics
Oct 10, 2016
13ead65
Design base changed , tree router created
Oct 10, 2016
218f778
Design base changed , tree router created
Oct 10, 2016
6a0a1ff
Merge remote-tracking branch 'upstream/dev' into analytics
Oct 13, 2016
fa93ac8
Conflict erroe
Oct 13, 2016
dd2f1b0
capacity html added
Oct 13, 2016
bef1912
capacity html added
Oct 13, 2016
587ddfe
Merge pull request #819 from hrushikesh07/analytics
udeshrl Oct 13, 2016
60a43b8
Implemented the Instance list for tagging server and soft delete from…
VIJAYKUMARNINGANURE Oct 21, 2016
f830cfd
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 21, 2016
7333be9
Removed the added comments in this file
VIJAYKUMARNINGANURE Oct 21, 2016
171faad
Removed the console logs
VIJAYKUMARNINGANURE Oct 24, 2016
6186cf3
Merge pull request #851 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Oct 24, 2016
7f666e6
Added day week filter
Oct 24, 2016
fc65365
Merge remote-tracking branch 'upstream/topic-cloud-analytics' into an…
Oct 24, 2016
430b4d2
Added day week filter
Oct 24, 2016
383e1e7
resolve merge conflict
Oct 24, 2016
bbe3a0f
Changed chart
Oct 24, 2016
17e4240
Merge pull request #855 from hrushikesh07/analytics
udeshrl Oct 24, 2016
cd809b5
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 25, 2016
12eb4a9
added name
udeshrl Oct 25, 2016
69a9042
changed save/update logic
udeshrl Oct 25, 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
2 changes: 2 additions & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js"></script>
<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>
<script src="src/partials/sections/dashboard/setting/organization/organizationListCtrl.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/clientRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
}).state('dashboard.design', {
url: "/design",
templateUrl: "src/partials/sections/dashboard/design/design.html",
controller: "designCtrl",
controller: "designCtrl as desCtrl",
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand Down
12 changes: 9 additions & 3 deletions client/cat3/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
'global.messages'
]);

angularApp.run(['$rootScope', 'auth', '$state', '$stateParams',
function ($rootScope, Auth, $state, $stateParams) {
angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
function ($rootScope, Auth, $state, $stateParams,$http,$window) {
'use strict';
$http.get('/organizations/getTreeNew').success(function (result) {
// if(result.data && result.data.length >0){
// console.log(result);
// $window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
// }
});
$rootScope.$on('$stateChangeStart', function (event, toState) {
//More function params: function (event, toState, toParams, fromState, fromParams)
function checkAuthentication() {
Expand Down Expand Up @@ -113,4 +119,4 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
$rootScope.$on('USER_LOGOUT', function () {
$scope.doLogout();
});
}]);
}]);
4 changes: 3 additions & 1 deletion client/cat3/src/partials/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ $imagePath : "../../../../../../cat3/images";
position: fixed;
width: 254px;
z-index: 10;
height: 100% !important;
transition: all .4s ease 0s;
left: -254px;
font-size: 12px !important;
height: 100%;

&.show-left-tree {
Expand All @@ -122,7 +124,7 @@ $imagePath : "../../../../../../cat3/images";
background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
color: #fff;
overflow-y: auto;
height: 100%;
height: 100% !important;
}

div[data-angular-treeview] {
Expand Down
8 changes: 4 additions & 4 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@
</ul>
<div class="well" id="well">
<div class="col-lg-5 col-md-5 col-sm-12 btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class="{'active':filterNewEnt.period === 'day'}" ng-click="analytic.applyFilter(true,'day')">DAY</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'week'}" ng-click="analytic.applyFilter(true,'week')">WEEK</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="analytic.applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="analytic.applyFilter(true,'year')">YEAR</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}" ng-click="applyFilter(true,'day')">DAY</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}" ng-click="applyFilter(true,'week')">WEEK</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="applyFilter(true,'year')">YEAR</button>
</div>
<div class="col-lg-7 col-md-7 col-sm-12 filter-wrapper">
<span ng-repeat="filt in filterNewEnt" ng-if="filt !== '' && filt.title">
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
}).state('dashboard.analytics.capacity', {
url: "capacity/",
templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html",
controller: "capacityCtrl as capacity",
params:{filterView:{capacity:true}},
controller: "capacityCtrl as capaCtr",
params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand Down
Loading