Skip to content

U
ulakbus-ui
Commit 3f5b16d0 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

missing momentjs file 

show detail page with form dynamic dispatch with multiple client_cmd
parent 73e967d2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 61 deletions
Gruntfile.js
View file @ 3f5b16d0
......@@ -147,7 +147,8 @@ module.exports = function (grunt) {
"app/bower_components/angular-loading-bar/build/loading-bar.js",
"app/bower_components/metisMenu/dist/metisMenu.js",
"app/bower_components/Chart.js/Chart.js",
"app/bower_components/intro.js/intro.js"
"app/bower_components/intro.js/intro.js",
"app/bower_components/moment/min/moment.min.js"
],
dest: 'dist/bower_components/components.js'
},
......@@ -198,7 +199,8 @@ module.exports = function (grunt) {
"app/bower_components/angular-loading-bar/build/loading-bar.min.js",
"app/bower_components/metisMenu/dist/metisMenu.min.js",
"app/bower_components/Chart.js/Chart.min.js",
"app/bower_components/intro.js/minified/intro.min.js"
"app/bower_components/intro.js/minified/intro.min.js",
"app/bower_components/moment/min/moment.min.js"
],
dest: 'dist/<%= grunt.branchname %>/bower_components/components.js'
},
......
app/app.css
View file @ 3f5b16d0
......@@ -91,6 +91,16 @@ a:hover {
letter-spacing: 0.5px;
}
/** DETAIL PAGE **/
.detail-page {
background-color: #fff;
padding: 15px;
border: 1px solid #E6E6E6;
}
/** END DETAIL PAGE **/
/** BRAND **/
.brand-bg {
......@@ -371,7 +381,6 @@ select {
}
.manager-view-content {
width: calc(100% - 300px);
padding:25px 40px;
overflow:auto;
-webkit-flex-grow: 1;
......@@ -1281,8 +1290,7 @@ table.dataTable thead .sorting:after {
}
.dashboard .user-pic {
width:150px;
height:150px;
width:100%;
}
.dashboard .panel-default > .panel-heading {
......@@ -1303,7 +1311,7 @@ table.dataTable thead .sorting:after {
}
.dashboard .quick-links .panel-default {
height: 274px;
/*height: 274px;*/
}
.dashboard .quick-links .panel-body,
......
app/components/crud/crud_controller.js
View file @ 3f5b16d0
......@@ -183,25 +183,21 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
return new Array(num);
};
//
$scope.showCmd = function () {
CrudUtility.generateParam($scope, $routeParams, $routeParams.cmd);
// todo: refactor createListObjects func
var createListObjects = function () {
angular.forEach($scope.object, function (value, key) {
if (typeof value == 'object') {
$scope.listobjects[key] = value;
delete $scope.object[key];
}
});
if ($scope.object.constructor === Array) {
$log.debug('new type show object')
$scope.createListObjects = function () {
if ($scope.object.constructor === Array) {
$log.debug('new type show object')
} else {
if ($scope.object.type) {
$scope.object = [$scope.object];
} else {
$scope.object = [{type: 'table', fields: angular.copy($scope.object)}];
}
};
}
};
$scope.listobjects = {};
$scope.showCmd = function () {
CrudUtility.generateParam($scope, $routeParams, $routeParams.cmd);
// todo: refactor createListObjects func
var pageData = Generator.getPageData();
if (pageData.pageData === true) {
......@@ -215,7 +211,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
$scope.model = $routeParams.model;
});
}
createListObjects();
$scope.createListObjects();
};
$scope.listFormCmd = function () {
// function to set scope objects
......@@ -233,6 +229,9 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'formService'])
$log.debug('pagedata', pageData.pageData);
CrudUtility.generateParam($scope, pageData, $routeParams.cmd);
setpageobjects(pageData, pageData);
if ($scope.second_client_cmd) {
$scope.createListObjects();
}
}
// if pageData didn't defined or is {pageData: false} go get data from api with get_wf function
if (pageData.pageData === undefined || pageData.pageData === false) {
......
app/components/crud/templates/crud.html
View file @ 3f5b16d0
<div class="row">
<div class="col-md-8">
<div ng-class="{'col-md-8': meta.allow_filters}">
<h3>{{ schema.title }}</h3>
<crud-show-directive ng-if="object"></crud-show-directive>
<crud-form-directive ng-if="forms"></crud-form-directive>
<crud-list-directive ng-if="objects"></crud-list-directive>
</div>
<crud-filters ng-if="meta.allow_filters === true" class="col-md-4 filtre"></crud-filters>
<crud-filters ng-show="meta.allow_filters === true" class="col-md-4 filtre"></crud-filters>
</div>
\ No newline at end of file
app/components/crud/templates/filter.html
View file @ 3f5b16d0
......@@ -14,8 +14,8 @@
<div class="checkbox" ng-repeat="filterItem in filter.values">
<label class="checkbox-inline">
<input type="checkbox" name="filter_group[]" ng-model="filterList[filter.field].model[filterItem.value]"
value="{{filterItem.value}}"/>
{{filterItem.name}}
value="{{filterItem.value || filterItem[0]}}"/>
{{filterItem.name || filterItem[1]}}
</label>
</div>
</div>
......
app/components/crud/templates/form.html
View file @ 3f5b16d0
<div>
<h3>{{ schema.title }}</h3>
<div class="buttons-on-top"></div>
<form id="formgenerated" name="formgenerated" sf-schema="schema" sf-form="form" sf-model="model"
......
app/components/crud/templates/show.html
View file @ 3f5b16d0
<div class="starter-template container">
<div ng-repeat="obj in object">
<div class="starter-template">
<div ng-repeat="obj in object" class="detail-page">
<div class="info-block-header">
<h3>{{model}}</h3>
<h3>{{obj.title}}</h3>
</div>
<div class="table-responsive">
<table class="table">
<thead ng-if="obj.type==='table-multiRow'">
<tr>
<td ng-repeat="(key, value) in obj[0]">{{key}}</td>
<td ng-repeat="(key, value) in obj.fields[0]">{{key}}</td>
</tr>
</thead>
<tbody ng-if="obj.type==='table-multiRow'">
<tr ng-repeat="row in obj.fields">
<td ng-repeat="(k,v) in row">{{v}}</td>
<td ng-repeat="(k,v) in row track by $index">{{v}}</td>
</tr>
</tbody>
<tbody ng-if="obj.type==='table'">
......
app/components/dashboard/dashboard.html
View file @ 3f5b16d0
<div ng-app="ulakbus.dashboard" class="dashboard">
<div class="starter-template">
<div class="starter-template" style="width: calc(100% - 300px);">
<div class="row">
......@@ -10,10 +10,13 @@
<div class="panel-title">Giriş Yapan Kullanıcı Bilgileri</div>
</div>
<div class="panel-body">
<div class="col-md-4 col-md-offset-4 text-center">
<img class="img-circle user-pic" src="{{$root.current_user.avatar}}"
<div class="col-md-6">
<img class="img-rounded user-pic"
src="{{$root.current_user.avatar || 'img/empty-profile-pic.jpg'}}"
alt="{{$root.current_user.username}}">
<p class="user-name">{{$root.current_user.name}} {{$root.current_user.surname}}</p>
</div>
<div class="col-md-6">
<p class="user-name">{{$root.current_user.name}}<br>{{$root.current_user.surname}}</p>
</div>
</div>
</div>
......@@ -102,6 +105,24 @@
</div>
<!-- end of dashboard-main-search -->
<div class="dashboard-main-anouncement clearfix">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Duyurular</div>
</div>
<div class="panel-body">
</div>
</div>
</div>
</div>
</div>
<!-- end of dashboard-main-anouncement -->
<div class="right-sidebar">
<div class="right-sidebar-box" data-step="4"
......
app/shared/directives.js
View file @ 3f5b16d0
......@@ -353,6 +353,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
// broadcast for authorized menu items, consume in dashboard to show search inputs and/or
// related items
$rootScope.$broadcast("authz", data);
$rootScope.searchInputs = data;
$rootScope.current_user = data.current_user;
......
app/zetalib/form_service.js
View file @ 3f5b16d0
......@@ -825,6 +825,7 @@ angular.module('formService', ['ui.bootstrap'])
data['param'] = $scope.form_params.param;
data['param_id'] = $scope.form_params.id;
data['pageData'] = true;
data['second_client_cmd'] = client_cmd[1];
generator.setPageData(data);
redirectTo($scope, client_cmd[0]);
......
dist/app.js
View file @ 3f5b16d0
This diff is collapsed.
dist/bower_components/components.js
View file @ 3f5b16d0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/app.css
View file @ 3f5b16d0
......@@ -104,6 +104,16 @@ a:hover {
letter-spacing: 0.5px;
}
/** DETAIL PAGE **/
.detail-page {
background-color: #fff;
padding: 15px;
border: 1px solid #E6E6E6;
}
/** END DETAIL PAGE **/
/** BRAND **/
.brand-bg {
......@@ -384,7 +394,6 @@ select {
}
.manager-view-content {
width: calc(100% - 300px);
padding:25px 40px;
overflow:auto;
-webkit-flex-grow: 1;
......@@ -1294,8 +1303,7 @@ table.dataTable thead .sorting:after {
}
.dashboard .user-pic {
width:150px;
height:150px;
width:100%;
}
.dashboard .panel-default > .panel-heading {
......@@ -1316,7 +1324,7 @@ table.dataTable thead .sorting:after {
}
.dashboard .quick-links .panel-default {
height: 274px;
/*height: 274px;*/
}
.dashboard .quick-links .panel-body,
......
dist/templates.js
View file @ 3f5b16d0
......@@ -22,12 +22,13 @@ angular.module("components/auth/login.html", []).run(["$templateCache", function
angular.module("components/crud/templates/crud.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/crud.html",
"<div class=\"row\">\n" +
" <div class=\"col-md-8\">\n" +
" <div ng-class=\"{'col-md-8': meta.allow_filters}\">\n" +
" <h3>{{ schema.title }}</h3>\n" +
" <crud-show-directive ng-if=\"object\"></crud-show-directive>\n" +
" <crud-form-directive ng-if=\"forms\"></crud-form-directive>\n" +
" <crud-list-directive ng-if=\"objects\"></crud-list-directive>\n" +
" </div>\n" +
" <crud-filters ng-if=\"meta.allow_filters === true\" class=\"col-md-4 filtre\"></crud-filters>\n" +
" <crud-filters ng-show=\"meta.allow_filters === true\" class=\"col-md-4 filtre\"></crud-filters>\n" +
"</div>");
}]);
......@@ -49,8 +50,8 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
" <div class=\"checkbox\" ng-repeat=\"filterItem in filter.values\">\n" +
" <label class=\"checkbox-inline\">\n" +
" <input type=\"checkbox\" name=\"filter_group[]\" ng-model=\"filterList[filter.field].model[filterItem.value]\"\n" +
" value=\"{{filterItem.value}}\"/>\n" +
" {{filterItem.name}}\n" +
" value=\"{{filterItem.value || filterItem[0]}}\"/>\n" +
" {{filterItem.name || filterItem[1]}}\n" +
" </label>\n" +
" </div>\n" +
" </div>\n" +
......@@ -118,8 +119,6 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
angular.module("components/crud/templates/form.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/form.html",
"<div>\n" +
" <h3>{{ schema.title }}</h3>\n" +
"\n" +
" <div class=\"buttons-on-top\"></div>\n" +
"\n" +
" <form id=\"formgenerated\" name=\"formgenerated\" sf-schema=\"schema\" sf-form=\"form\" sf-model=\"model\"\n" +
......@@ -239,21 +238,21 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
angular.module("components/crud/templates/show.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/show.html",
"<div class=\"starter-template container\">\n" +
" <div ng-repeat=\"obj in object\">\n" +
"<div class=\"starter-template\">\n" +
" <div ng-repeat=\"obj in object\" class=\"detail-page\">\n" +
" <div class=\"info-block-header\">\n" +
" <h3>{{model}}</h3>\n" +
" <h3>{{obj.title}}</h3>\n" +
" </div>\n" +
" <div class=\"table-responsive\">\n" +
" <table class=\"table\">\n" +
" <thead ng-if=\"obj.type==='table-multiRow'\">\n" +
" <tr>\n" +
" <td ng-repeat=\"(key, value) in obj[0]\">{{key}}</td>\n" +
" <td ng-repeat=\"(key, value) in obj.fields[0]\">{{key}}</td>\n" +
" </tr>\n" +
" </thead>\n" +
" <tbody ng-if=\"obj.type==='table-multiRow'\">\n" +
" <tr ng-repeat=\"row in obj.fields\">\n" +
" <td ng-repeat=\"(k,v) in row\">{{v}}</td>\n" +
" <td ng-repeat=\"(k,v) in row track by $index\">{{v}}</td>\n" +
" </tr>\n" +
" </tbody>\n" +
" <tbody ng-if=\"obj.type==='table'\">\n" +
......@@ -271,7 +270,7 @@ angular.module("components/crud/templates/show.html", []).run(["$templateCache",
angular.module("components/dashboard/dashboard.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/dashboard/dashboard.html",
"<div ng-app=\"ulakbus.dashboard\" class=\"dashboard\">\n" +
" <div class=\"starter-template\">\n" +
" <div class=\"starter-template\" style=\"width: calc(100% - 300px);\">\n" +
"\n" +
"\n" +
" <div class=\"row\">\n" +
......@@ -282,10 +281,13 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" <div class=\"panel-title\">Giriş Yapan Kullanıcı Bilgileri</div>\n" +
" </div>\n" +
" <div class=\"panel-body\">\n" +
" <div class=\"col-md-4 col-md-offset-4 text-center\">\n" +
" <img class=\"img-circle user-pic\" src=\"{{$root.current_user.avatar}}\"\n" +
" <div class=\"col-md-6\">\n" +
" <img class=\"img-rounded user-pic\"\n" +
" src=\"{{$root.current_user.avatar || 'img/empty-profile-pic.jpg'}}\"\n" +
" alt=\"{{$root.current_user.username}}\">\n" +
" <p class=\"user-name\">{{$root.current_user.name}} {{$root.current_user.surname}}</p>\n" +
" </div>\n" +
" <div class=\"col-md-6\">\n" +
" <p class=\"user-name\">{{$root.current_user.name}}<br>{{$root.current_user.surname}}</p>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
......@@ -374,6 +376,24 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </div>\n" +
" <!-- end of dashboard-main-search -->\n" +
"\n" +
" <div class=\"dashboard-main-anouncement clearfix\">\n" +
"\n" +
" <div class=\"row\">\n" +
" <div class=\"col-md-12\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Duyurular</div>\n" +
" </div>\n" +
" <div class=\"panel-body\">\n" +
"\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" </div>\n" +
" <!-- end of dashboard-main-anouncement -->\n" +
"\n" +
" <div class=\"right-sidebar\">\n" +
"\n" +
" <div class=\"right-sidebar-box\" data-step=\"4\"\n" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment