Skip to content

U
ulakbus-ui
Commit 8bf2eea3 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

download reports

parent ed4a4025
Expand all Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 143 deletions
app/components/crud/templates/list.html
View file @ 8bf2eea3
......@@ -18,7 +18,7 @@
Hepsini Seç
</label>
</td>
<td ng-repeat="value in objects[0]" ng-if="objects[0]!='-1'">{{value}}</td>
<td ng-repeat="value in objects[0] track by $index" ng-if="objects[0]!='-1'">{{value}}</td>
<td ng-if="objects[0]=='-1'">{{ schema.title||model}}</td>
<td>action</td>
</tr>
......@@ -39,7 +39,7 @@
</td>
<td>
<button class="btn btn-info" style="margin-right: 5px;" ng-repeat="action in object.actions"
<button class="btn btn-info" style="margin-right: 5px;" ng-repeat="action in object.actions track by $index"
ng-if="action.show_as==='button'"
ng-click="do_action(object.key, action)">{{action
.name}}
......
app/components/dashboard/dashboard.html
View file @ 8bf2eea3
......@@ -11,7 +11,8 @@
</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}}" alt="{{$root.current_user.username}}">
<img class="img-circle user-pic" src="{{$root.current_user.avatar}}"
alt="{{$root.current_user.username}}">
<p class="user-name">{{$root.current_user.name}} {{$root.current_user.surname}}</p>
</div>
</div>
......@@ -25,8 +26,9 @@
</div>
<div class="panel-body">
<div class="col-md-6 text-center link-buttons" ng-repeat="menu in $root.quick_menu">
<a ng-href="#/{{menu[0].wf}}/{{menu[0].model}}?{{menu[0].param}}={{selectedUser.key}}">
{{menu[0].text}}
<a ng-repeat="item in menu"
ng-href="#/{{item.wf}}/{{item.model}}?{{item.param}}={{selectedUser.key}}">
{{item.text}}
</a>
</div>
</div>
......@@ -38,7 +40,7 @@
<div class="dashboard-main-search clearfix">
<div class="row" ng-if="$root.current_user.is_staff">
<div class="row" ng-show="$root.current_user.is_staff">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
......@@ -47,7 +49,7 @@
<div class="panel-body">
<div class="dashboard-student-search" data-step="2"
data-intro="isim veya tcno ile öğrenci araması yapabilirsiniz."
ng-show="menuitems.ogrenci">
ng-show="$root.searchInputs.ogrenci">
<div class="text-center">
<h3>ÖĞRENCİ</h3>
<input type="text" placeholder="Öğrenci ara" ng-model="keyword.student"
......@@ -69,7 +71,8 @@
</div>
<!-- end of dashboard-student-search -->
<div class="dashboard-personnel-search" data-step="3"
data-intro="isim veya tcno ile personel araması yapabilirsiniz." ng-show="menuitems.personel">
data-intro="isim veya tcno ile personel araması yapabilirsiniz."
ng-show="$root.searchInputs.personel">
<div class="text-center">
<h3>PERSONEL</h3>
<input type="text" placeholder="Personel ara" ng-model="keyword.staff"
......
app/components/dashboard/dashboard_controller.js
View file @ 8bf2eea3
......@@ -20,7 +20,7 @@ angular.module('ulakbus.dashboard', [])
// to show search box based on authz
$scope.$on("authz", function (event, data) {
$scope.menuitems = data;
$rootScope.searchInputs = data;
});
$scope.keyword = {student: "", staff: ""};
......
app/shared/directives.js
View file @ 8bf2eea3
......@@ -117,8 +117,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
model: $scope.$parent.form_params.model,
cmd: $scope.$parent.reload_cmd,
flow: $scope.$parent.form_params.flow,
param: 'query',
id: $scope.searchModel.searchbox
query: $scope.searchModel.searchbox
}
};
......@@ -310,7 +309,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
restrict: 'E',
replace: true,
scope: {},
controller: function ($scope, $rootScope, $cookies, $route, $http, RESTURL, $location, $window, $timeout) {
controller: function ($scope, $rootScope, $cookies, $route, $http, RESTURL, $log, $location, $window, $timeout) {
$scope.prepareMenu = function (menuItems) {
var newMenuItems = {};
angular.forEach(menuItems, function (value, key) {
......@@ -349,6 +348,7 @@ app.directive('logout', function ($http, $location, RESTURL) {
$rootScope.quick_menu = reGroupMenuItems(data.quick_menu, 'quick_menus');
delete data.quick_menu;
$log.debug('quick menu', $rootScope.quick_menu);
// broadcast for authorized menu items, consume in dashboard to show search inputs and/or
// related items
......
app/shared/templates/filefield.html
View file @ 8bf2eea3
......@@ -14,6 +14,7 @@
sf-changed="form"
class="form-control {{form.fieldHtmlClass}}"
schema-validate="form"
ng-change="form.fileInsert()"
name="{{form.name}}"/>
</div>
......
app/zetalib/form_service.js
View file @ 8bf2eea3
......@@ -20,7 +20,7 @@ angular.module('formService', ['ui.bootstrap'])
* @description
* form service's Generator factory service handles all generic form operations
*/
.factory('Generator', function ($http, $q, $timeout, $location, $route, $compile, $log, RESTURL, $rootScope) {
.factory('Generator', function ($http, $q, $timeout, $sce, $location, $route, $compile, $log, RESTURL, $rootScope) {
var generator = {};
/**
* @name makeUrl
......@@ -213,7 +213,9 @@ angular.module('formService', ['ui.bootstrap'])
templateUrl: "shared/templates/filefield.html",
name: k,
key: k,
titleMap: v.titleMap
fileInsert: function () {
$scope.$broadcast('schemaForm.error.' + k, 'tv4-302', true);
}
};
v.type = 'string';
}
......@@ -904,7 +906,18 @@ angular.module('formService', ['ui.bootstrap'])
};
return $http.post(generator.makeUrl($scope), data)
.success(function (data) {
.success(function (data, status, headers) {
if (headers('content-type') === "application/pdf") {
var a = document.createElement("a");
document.body.appendChild(a);
a.style = "display: none";
var file = new Blob([data], {type: 'application/pdf'});
var fileURL = URL.createObjectURL(file);
var fileName = $scope.schema.title;
a.href = fileURL;
a.download = fileName;
a.click();
}
if (redirectTo === true) {
if (data.client_cmd) {
generator.pathDecider(data.client_cmd, $scope, data);
......
dist/app.js
View file @ 8bf2eea3
This diff is collapsed.
dist/bower_components/components.js
View file @ 8bf2eea3
This diff is collapsed.
dist/templates.js
View file @ 8bf2eea3
......@@ -181,7 +181,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" Hepsini Seç\n" +
" </label>\n" +
" </td>\n" +
" <td ng-repeat=\"value in objects[0]\" ng-if=\"objects[0]!='-1'\">{{value}}</td>\n" +
" <td ng-repeat=\"value in objects[0] track by $index\" ng-if=\"objects[0]!='-1'\">{{value}}</td>\n" +
" <td ng-if=\"objects[0]=='-1'\">{{ schema.title||model}}</td>\n" +
" <td>action</td>\n" +
" </tr>\n" +
......@@ -202,7 +202,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
" </td>\n" +
"\n" +
" <td>\n" +
" <button class=\"btn btn-info\" style=\"margin-right: 5px;\" ng-repeat=\"action in object.actions\"\n" +
" <button class=\"btn btn-info\" style=\"margin-right: 5px;\" ng-repeat=\"action in object.actions track by $index\"\n" +
" ng-if=\"action.show_as==='button'\"\n" +
" ng-click=\"do_action(object.key, action)\">{{action\n" +
" .name}}\n" +
......@@ -272,10 +272,10 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
$templateCache.put("components/dashboard/dashboard.html",
"<div ng-app=\"ulakbus.dashboard\" class=\"dashboard\">\n" +
" <div class=\"starter-template\">\n" +
" \n" +
" \n" +
"\n" +
"\n" +
" <div class=\"row\">\n" +
" \n" +
"\n" +
" <div class=\"col-md-6 user-info\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
......@@ -283,13 +283,14 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </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}}\" alt=\"{{$root.current_user.username}}\">\n" +
" <img class=\"img-circle user-pic\" src=\"{{$root.current_user.avatar}}\"\n" +
" alt=\"{{$root.current_user.username}}\">\n" +
" <p class=\"user-name\">{{$root.current_user.name}} {{$root.current_user.surname}}</p>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" \n" +
"\n" +
" <div class=\"col-md-6 quick-links\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
......@@ -297,20 +298,21 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </div>\n" +
" <div class=\"panel-body\">\n" +
" <div class=\"col-md-6 text-center link-buttons\" ng-repeat=\"menu in $root.quick_menu\">\n" +
" <a ng-href=\"#/{{menu[0].wf}}/{{menu[0].model}}?{{menu[0].param}}={{selectedUser.key}}\">\n" +
" {{menu[0].text}} \n" +
" <a ng-repeat=\"item in menu\"\n" +
" ng-href=\"#/{{item.wf}}/{{item.model}}?{{item.param}}={{selectedUser.key}}\">\n" +
" {{item.text}}\n" +
" </a>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" \n" +
"\n" +
" </div>\n" +
" <!-- end of row -->\n" +
" \n" +
"\n" +
" <div class=\"dashboard-main-search clearfix\">\n" +
" \n" +
" <div class=\"row\" ng-if=\"$root.current_user.is_staff\">\n" +
"\n" +
" <div class=\"row\" ng-show=\"$root.current_user.is_staff\">\n" +
" <div class=\"col-md-12\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
......@@ -319,7 +321,7 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" <div class=\"panel-body\">\n" +
" <div class=\"dashboard-student-search\" data-step=\"2\"\n" +
" data-intro=\"isim veya tcno ile öğrenci araması yapabilirsiniz.\"\n" +
" ng-show=\"menuitems.ogrenci\">\n" +
" ng-show=\"$root.searchInputs.ogrenci\">\n" +
" <div class=\"text-center\">\n" +
" <h3>ÖĞRENCİ</h3>\n" +
" <input type=\"text\" placeholder=\"Öğrenci ara\" ng-model=\"keyword.student\"\n" +
......@@ -341,7 +343,8 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </div>\n" +
" <!-- end of dashboard-student-search -->\n" +
" <div class=\"dashboard-personnel-search\" data-step=\"3\"\n" +
" data-intro=\"isim veya tcno ile personel araması yapabilirsiniz.\" ng-show=\"menuitems.personel\">\n" +
" data-intro=\"isim veya tcno ile personel araması yapabilirsiniz.\"\n" +
" ng-show=\"$root.searchInputs.personel\">\n" +
" <div class=\"text-center\">\n" +
" <h3>PERSONEL</h3>\n" +
" <input type=\"text\" placeholder=\"Personel ara\" ng-model=\"keyword.staff\"\n" +
......@@ -367,7 +370,7 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </div>\n" +
" </div>\n" +
" </div>\n" +
" \n" +
"\n" +
" </div>\n" +
" <!-- end of dashboard-main-search -->\n" +
"\n" +
......@@ -1544,6 +1547,7 @@ angular.module("shared/templates/filefield.html", []).run(["$templateCache", fun
" sf-changed=\"form\"\n" +
" class=\"form-control {{form.fieldHtmlClass}}\"\n" +
" schema-validate=\"form\"\n" +
" ng-change=\"form.fileInsert()\"\n" +
" name=\"{{form.name}}\"/>\n" +
" </div>\n" +
"\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