Skip to content

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

dashboard for user role

parent 5ab352e5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 332 additions and 186 deletions
app/app.css
View file @ d2eda8e9
......@@ -1026,7 +1026,7 @@ table.dataTable thead .sorting:after {
/* DASHBOARD */
.dashboard .row {
margin-bottom:30px;
margin-bottom:10px;
}
.dashboard .major-buttons {
......
app/components/dashboard/dashboard.html
View file @ d2eda8e9
......@@ -2,14 +2,39 @@
<div class="starter-template">
<div class="dashboard-main-search clearfix">
<div class="row">
<div class="panel panel-default">
<div class="panel-heading collapsed" data-toggle="collapse" data-target="#user-info"
aria-expanded="true" aria-controls="user-info">
<div class="panel-title">Giriş Yapan Kullanıcı Bilgileri</div>
</div>
<div class="panel-body collapse" id="user-info">
<div class="col-md-4 col-md-offset-4 text-center">
<img class="img-circle img-responsive" src="{{$root.current_user.avatar}}"
alt="{{$root.current_user.username}}">
<p>{{$root.current_user.name}} {{$root.current_user.surname}}</p>
</div>
</div>
</div>
</div>
<div class="row" ng-if="$root.current_user.is_staff">
<div class="panel panel-default">
<div class="panel-heading" data-toggle="collapse" data-target="#search_users"
aria-expanded="true" aria-controls="search_users">
<div class="panel-title">Arama</div>
</div>
<div class="panel-body" id="search_users">
<div class="dashboard-student-search" data-step="2"
data-intro="isim veya tcno ile öğrenci araması yapabilirsiniz.">
<div class="text-center">
<h3>ÖĞRENCİ</h3>
<input type="text" placeholder="Öğrenci ara" ng-model="student_kw" ng-keyup="search('ogrenci')">
<input type="text" placeholder="Öğrenci ara" ng-model="student_kw"
ng-keyup="search('ogrenci')">
<span class="bordered-fa-icon fa fa-search" ng-click="search('ogrenci')"></span>
</div>
<div class="dashboard-search-results">
<div class="dashboard-search-results" ng-show="showResults">
<ul ng-if="students.length > 0">
<li ng-repeat="student in students">
<a role="button">
......@@ -27,10 +52,11 @@
data-intro="isim veya tcno ile personel araması yapabilirsiniz.">
<div class="text-center">
<h3>PERSONEL</h3>
<input type="text" placeholder="Personel ara" ng-model="staff_kw" ng-keyup="search('personel')">
<input type="text" placeholder="Personel ara" ng-model="staff_kw"
ng-keyup="search('personel')">
<span class="bordered-fa-icon fa fa-search" ng-click="search('personel')"></span>
</div>
<div class="dashboard-search-results">
<div class="dashboard-search-results" ng-show="showResults">
<ul ng-if="staffs.length > 0">
<li ng-repeat="staff in staffs">
<a role="button">
......@@ -46,6 +72,25 @@
</div>
<!-- end of dashboard-personnel-search -->
</div>
</div>
</div>
<div class="row">
<div class="panel panel-default">
<div class="panel-heading" data-toggle="collapse" data-target="#quick-menu-items"
aria-expanded="true" aria-controls="quick-menu-items">
<div class="panel-title">Hızlı İşlemler</div>
</div>
<div class="panel-body" id="quick-menu-items">
<div class="col-md-6 text-center" ng-repeat="menu in $root.quick_menu">
<a ng-href="#/{{menu[0].wf}}/{{menu[0].model}}?{{menu[0].param}}={{selectedUser.key}}">
{{menu[0].text}} <i class="fa fa-connectdevelop"></i>
</a>
</div>
</div>
</div>
</div>
</div>
<!-- end of dashboard-main-search -->
<div class="right-sidebar">
......
app/components/dashboard/dashboard_controller.js
View file @ d2eda8e9
......@@ -50,6 +50,7 @@ angular.module('ulakbus.dashboard', [])
};
$scope.getItems = function (where, what) {
$scope.showResults = true;
return $http.get(RESTURL.url + 'ara/' + where + '/' + what);
};
......@@ -69,6 +70,7 @@ angular.module('ulakbus.dashboard', [])
$rootScope.$broadcast('selectedUser', {name: who[0], tcno: who[1], key: who[2]});
// get 'who's related transactions and manipulate sidebar menu
$rootScope.$broadcast("menuitems", type);
$scope.showResults = false;
};
......@@ -76,6 +78,15 @@ angular.module('ulakbus.dashboard', [])
$scope.notifications = data;
});
$scope.$on('selectedUser', function ($event, data) {
$scope.selectedUser = data;
});
$scope.deselectUser = function () {
delete $scope.selectedUser;
delete $scope.selectedMenuItems;
};
$scope.markAsRead = function (items) {
$rootScope.$broadcast("markasread", items);
}
......
app/shared/directives.js
View file @ d2eda8e9
......@@ -340,13 +340,22 @@ app.directive('logout', function ($http, $location, RESTURL) {
}
angular.forEach($scope.allMenuItems, function (value, key) {
if (key !== 'current_user' && key !== 'settings') {
$scope.allMenuItems[key] = reGroupMenuItems(value, key);
}
});
// quick menus to dashboard via rootscope
$rootScope.quick_menu = reGroupMenuItems(data.quick_menu, 'quick_menus');
delete data.quick_menu;
// broadcast for authorized menu items, consume in dashboard to show search inputs and/or
// related items
$rootScope.$broadcast("authz", data);
$rootScope.current_user = data.current_user;
$scope.menuItems = $scope.prepareMenu({other: $scope.allMenuItems.other});
// if selecteduser on cookie then add related part to the menu
......
app/shared/templates/directives/header-notification.html
View file @ d2eda8e9
......@@ -84,7 +84,8 @@
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-user fa-fw" tooltip-placement="bottom" uib-tooltip="Profil"></i> <i
<i class="fa fa-user fa-fw" tooltip-placement="bottom"
uib-tooltip="Profil"></i>&nbsp;{{$root.current_user.username}}&nbsp;<i
class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-user">
......
app/shared/templates/directives/sidebar.html
View file @ d2eda8e9
......@@ -2,7 +2,7 @@
<div class="sidebar-container">
<!-- sidebar-person-info -->
<div class="sidebar-person-info">
<div class="sidebar-person-info" ng-if="$root.current_user.is_staff">
<!--<button class="btn btn-primary close-sidebar-person-info">Profili Kapat</button>-->
<div class="identity">
<button type="button" class="close" ng-class="{hidden: $root.collapsed || !selectedUser}"
......
app/zetalib/form_service.js
View file @ d2eda8e9
......@@ -504,6 +504,7 @@ angular.module('formService', ['ui.bootstrap'])
}
});
}
if (filterValue <= 2) { formitem.filteredItems = formitem.titleMap}
formitem.filteredItems = generator.get_diff_array(formitem.filteredItems, formitem.selectedFilteredItems);
},
select: function (selectedItemsModel) {
......
app/zetalib/interceptors.js
View file @ d2eda8e9
......@@ -65,7 +65,7 @@ app.config(['$httpProvider', function ($httpProvider) {
}
$('<div class="modal">' +
'<div class="modal-dialog" style="width:1024px;" role="document">' +
'<div class="modal-dialog" style="width:100%;" role="document">' +
'<div class="modal-content">' +
'<div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span' +
......
dist/app.js
View file @ d2eda8e9
This diff is collapsed.
dist/bower_components/components.js
View file @ d2eda8e9
This diff is collapsed.
dist/css/app.css
View file @ d2eda8e9
......@@ -1039,7 +1039,7 @@ table.dataTable thead .sorting:after {
/* DASHBOARD */
.dashboard .row {
margin-bottom:30px;
margin-bottom:10px;
}
.dashboard .major-buttons {
......
dist/templates.js
View file @ d2eda8e9
This diff is collapsed.
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