Skip to content

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

designer want to see pages before implemented

parent 5bbee45f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1052 additions and 67 deletions
app/app.js
View file @ 0365916a
...@@ -37,6 +37,7 @@ angular.module( ...@@ -37,6 +37,7 @@ angular.module(
'ulakbus.version', 'ulakbus.version',
'gettext', 'gettext',
'markdown', 'markdown',
'ulakbus.uitemplates'
]) ])
/** /**
* @memberof ulakbus * @memberof ulakbus
......
app/app_routes.js
View file @ 0365916a
...@@ -23,6 +23,10 @@ angular.module('ulakbus') ...@@ -23,6 +23,10 @@ angular.module('ulakbus')
templateUrl: 'components/admin/bpmn_manager.html', templateUrl: 'components/admin/bpmn_manager.html',
controller: 'BpmnManagerController' controller: 'BpmnManagerController'
}) })
.when('/newdesigns', {
templateUrl: 'components/uitemplates/base.html',
controller: 'NewDesignsCtrl'
})
// use crud without selected user // use crud without selected user
// important: regex urls must be defined later than static ones // important: regex urls must be defined later than static ones
......
app/components/uitemplates/academician.html 0 → 100644
View file @ 0365916a
<div class="row">
<!-- ACADEMICIAN COURSES -->
<div class="col-lg-5 col-md-12 academician-course-list">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Dersler</div>
</div>
<div class="panel-body">
<ul>
<li><a href="#"><span>181</span> Basic Physics <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>421</span> Research and Development <div>Asistanlar: Erkan Öğümsöğütlü</div></a></li>
<li><a href="#"><span>435</span> Project Management and Development <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>207</span> Design and Use of Instructional Material <div>Asistanlar: -</div></a></li>
<li><a href="#"><span>323</span> Multimedia Design and Development <div>Asistanlar: Evren Kutar</div></a></li>
<li><a href="#"><span>475</span> Climate Change Education for Sustainability <div>Asistanlar: Evren Kutar</div></a></li>
</ul>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN COURSES -->
<!-- ACADEMICIAN WEEKLY SCHEDULE -->
<div class="col-lg-7 col-md-12 academician-weekly-schedule">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Ders Programı</div>
</div>
<div class="panel-body">
<table border="1">
<tbody>
<tr class="days">
<td></td>
<td>Pazartesi</td>
<td>Salı</td>
<td>Çarşamba</td>
<td>Perşembe</td>
<td>Cuma</td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>09:40 - 09:30</td>
<td><a uib-tooltip="Bacis Physics - Derslik 5">181</a></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td><a uib-tooltip="Research and Development - Derslik 1">421</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td><a uib-tooltip="Project Management and Development - Derslik 8">435</a></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td><a uib-tooltip="Design and Use of Instructional Material - Derslik 4">207</a></td>
<td><a uib-tooltip="Multimedia Design and Development - Derslik 9">323</a></td>
<td></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
<tr>
<td>08:40 - 09:30</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a uib-tooltip="Climate Change Education for Sustainability - Derslik 15">475</a></td>
</tr>
</tbody>
</table>
<p class="schedule-notice"><span>Not:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</div>
</div>
<!-- END OF ACADEMICIAN WEEKLY SCHEDULE -->
</div>
\ No newline at end of file
app/components/uitemplates/base.html 0 → 100644
View file @ 0365916a
<select ng-model="selection" ng-options="item for item in items">
</select>
<div ng-switch on="selection">
<div ng-app="ulakbus.dashboard" class="dashboard academician-dashboard">
<div class="starter-template">
<div ng-switch-default="student">
<ng-include src="'components/uitemplates/student.html'"></ng-include>
</div>
<div ng-switch-when="staff">
<ng-include src="'components/uitemplates/staff.html'"></ng-include>
</div>
<div ng-switch-when="academician">
<ng-include src="'components/uitemplates/academician.html'"></ng-include>
</div>
</div>
</div>
</div>
\ No newline at end of file
app/components/uitemplates/staff.html 0 → 100644
View file @ 0365916a
<div class="dashboard-main-search clearfix">
<div class="row" ng-if="$root.current_user.can_search">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Arama</div>
</div>
<div class="panel-body">
<div class="dashboard-student-search" data-step="2"
data-intro="isim veya tcno ile öğrenci araması yapabilirsiniz."
ng-show="$root.searchInputs.ogrenci">
<div class="text-center">
<h3>ÖĞRENCİ</h3>
<input type="text" placeholder="Öğrenci ara" ng-model="keyword.student"
ng-keyup="search('ogrenci')">
<span class="bordered-fa-icon fa fa-search" ng-click="search('ogrenci')"></span>
</div>
<div class="dashboard-search-results" ng-show="showResults">
<ul ng-if="students.length > 0">
<li ng-repeat="student in students">
<a role="button">
<span ng-click="select(student, 'ogrenci')">{{student[0]}}</span>
<i class="fa fa-fw fa-info-circle pull-right" popover-placement="bottom"
uib-popover-template="userPopover.templateUrl"
ng-click="get_info('Ogrenci', student[2])"></i></a>
</li>
</ul>
</div>
<!-- end of dashboard-student-search-results -->
</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="$root.searchInputs.personel">
<div class="text-center">
<h3>PERSONEL</h3>
<input type="text" placeholder="Personel ara" ng-model="keyword.staff"
ng-keyup="search('personel')">
<span class="bordered-fa-icon fa fa-search" ng-click="search('personel')"></span>
</div>
<div class="dashboard-search-results" ng-show="showResults">
<ul ng-if="staffs.length > 0">
<li ng-repeat="staff in staffs">
<a role="button">
<span ng-click="select(staff, 'personel')">{{staff[0]}}</span>
<i class="fa fa-fw fa-info-circle pull-right"
popover-placement="bottom"
uib-popover-template="userPopover.templateUrl"
ng-click="get_info('Personel', staff[2])"></i></a>
</li>
</ul>
</div>
<!-- end of dashboard-personnel-search-results -->
</div>
<!-- end of dashboard-personnel-search -->
</div>
</div>
</div>
</div>
</div>
<!-- end of dashboard-main-search -->
<div class="row">
<div class="col-md-12 quick-links">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Hızlı İşlemler</div>
<div class="panel-action pull-right"><i class="fa fa-edit fa-fw"></i> Düzenle</div>
</div>
<div class="panel-body">
<div class="col-md-6 text-center link-buttons"
ng-repeat="item in $root.quick_menu track by $index">
<a
ng-href="#/{{item.wf}}/{{item.model}}?{{item.param}}={{selectedUser.key}}">
{{item.text}}
</a>
</div>
</div>
</div>
</div>
</div>
<!-- end of row -->
<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">
<a ng-click="markAsRead(notify)"
ng-repeat="notify in notifications[3] | limitTo:5">{{notify
.body}}</a>
</div>
</div>
</div>
</div>
</div>
<!-- end of dashboard-main-anouncement -->
\ No newline at end of file
app/components/uitemplates/student.html 0 → 100644
View file @ 0365916a
This diff is collapsed.
app/components/uitemplates/uitemplates.js
View file @ 0365916a
...@@ -6,17 +6,9 @@ ...@@ -6,17 +6,9 @@
* (GPLv3). See LICENSE.txt for details. * (GPLv3). See LICENSE.txt for details.
*/ */
// 'use strict';
// app.config(['$routeProvider', function ($routeProvider) {
// $routeProvider
// .when('/500', {
// templateUrl: 'components/uitemplates/500.html',
// controller: '500Ctrl'
// });
// }]);
angular.module('ulakbus.uitemplates', ['ngRoute']) angular.module('ulakbus.uitemplates', ['ngRoute'])
// .controller('500Ctrl', function ($scope, $rootScope, $location) { .controller('NewDesignsCtrl', function ($scope) {
// }); $scope.items = ['student', 'staff', 'academician'];
\ No newline at end of file $scope.selection = $scope.items[0];
});
\ No newline at end of file
app/index.html
View file @ 0365916a
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
<script src="components/debug/debug_controller.js"></script> <script src="components/debug/debug_controller.js"></script>
<script src="components/devSettings/devSettings_controller.js"></script> <script src="components/devSettings/devSettings_controller.js"></script>
<script src="components/error_pages/error_controller.js"></script> <script src="components/error_pages/error_controller.js"></script>
<script src="components/uitemplates/uitemplates.js"></script>
<script src="components/version/interpolate-filter.js"></script> <script src="components/version/interpolate-filter.js"></script>
<script src="components/version/version-directive.js"></script> <script src="components/version/version-directive.js"></script>
<script src="components/version/version.js"></script> <script src="components/version/version.js"></script>
......
app/main.html
View file @ 0365916a
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
<script src="components/debug/debug_controller.js"></script> <script src="components/debug/debug_controller.js"></script>
<script src="components/devSettings/devSettings_controller.js"></script> <script src="components/devSettings/devSettings_controller.js"></script>
<script src="components/error_pages/error_controller.js"></script> <script src="components/error_pages/error_controller.js"></script>
<script src="components/uitemplates/uitemplates.js"></script>
<script src="components/version/interpolate-filter.js"></script> <script src="components/version/interpolate-filter.js"></script>
<script src="components/version/version-directive.js"></script> <script src="components/version/version-directive.js"></script>
<script src="components/version/version.js"></script> <script src="components/version/version.js"></script>
......
app/main.js
View file @ 0365916a
...@@ -41,6 +41,7 @@ angular.module( ...@@ -41,6 +41,7 @@ angular.module(
'templates-prod', 'templates-prod',
// @endif // @endif
// @if NODE_ENV='DEVELOPMENT' // @if NODE_ENV='DEVELOPMENT'
'ulakbus.uitemplates'
// @endif // @endif
]) ])
/** /**
......
app/shared/directives.js
View file @ 0365916a
...@@ -56,26 +56,13 @@ angular.module('ulakbus') ...@@ -56,26 +56,13 @@ angular.module('ulakbus')
$scope.notifications[value.type].push(value); $scope.notifications[value.type].push(value);
}); });
}; };
/** /**
* Get notifications from API's /notify path and group it then broadcast "notifications" object. * When "notifications" send via websocket, parse notifications by type.
* {ignoreLoadingBar: true} is telling loading bar not work on this particular request.
*/ */
$scope.getNotifications = function () { $scope.$on("notifications", function (event, data) {
// ignore loading bar here $scope.groupNotifications(data.notifications);
//$http.get(RESTURL.url + "notify", {ignoreLoadingBar: true}).success(function (data) { });
// $scope.groupNotifications(data.notifications);
// $rootScope.$broadcast("notifications", $scope.notifications);
//});
};
$scope.getNotifications();
// check notifications every 5 seconds
$interval(function () {
if ($cookies.get("notificate") == "on") {
$scope.getNotifications();
}
}, 5000);
/** /**
* When clicked mark the notification as read. * When clicked mark the notification as read.
......
app/zetalib/socket.js
View file @ 0365916a
...@@ -81,14 +81,13 @@ angular.module('ulakbus') ...@@ -81,14 +81,13 @@ angular.module('ulakbus')
$log.info("DISCONNEDTED", event); $log.info("DISCONNEDTED", event);
}; };
// two types of data can be come from websocket: with / without callback // two types of data can be come from websocket: with and without callback
// //
wsOps.callbacks = {}; wsOps.callbacks = {};
wsOps.onMessage = function (event) { wsOps.onMessage = function (event) {
var data = angular.fromJson(event.data); // msg_methods are dispatch methods for incoming events. init is the default method to run
if (data.hasOwnProperty('error')) { var msg_methods = {
ErrorService.handle(data, 'ws'); init: function (data) {
}
if (angular.isDefined(wsOps.callbacks[data.callbackID])) { if (angular.isDefined(wsOps.callbacks[data.callbackID])) {
var callback = wsOps.callbacks[data.callbackID]; var callback = wsOps.callbacks[data.callbackID];
delete wsOps.callbacks[data.callbackID]; delete wsOps.callbacks[data.callbackID];
...@@ -96,7 +95,27 @@ angular.module('ulakbus') ...@@ -96,7 +95,27 @@ angular.module('ulakbus')
} else { } else {
$log.info("Data without callback: %o", data); $log.info("Data without callback: %o", data);
} }
},
error: function (data) {
ErrorService.handle(data, 'ws');
},
notification: function () {
$rootScope.$broadcast('notifications', data["notifications"]);
}
};
// do_action is the dispatcher function for incoming events
var do_action = function (options) {
var args = [].slice.call(arguments, 0),
initialized = false,
action = 'init';
if (typeof msg_methods[args[1]] === 'function') {
action = args[1];
args.shift();
}
return msg_methods[action](args[0]);
};
var msg_data = angular.fromJson(event.data);
do_action(msg_data, msg_data.error || msg_data.notification);
$log.info("MESSAGE:", event, "Data:", JSON.parse(event.data)); $log.info("MESSAGE:", event, "Data:", JSON.parse(event.data));
}; };
...@@ -131,24 +150,5 @@ angular.module('ulakbus') ...@@ -131,24 +150,5 @@ angular.module('ulakbus')
delete websocket; delete websocket;
} }
wsOps.waitForSocketConnection = function (socket, callback) {
$timeout(
function () {
if (angular.isDefined(socket)) {
if (socket.readyState === 1) {
$log.info("Connection made.");
if (callback != null) {
callback();
}
} else {
$log.info("waiting for connection...");
wsOps.waitForSocketConnection(socket, callback);
}
} else {
$log.info("waiting for connection...");
wsOps.waitForSocketConnection(socket, callback);
}
}, 50); // wait 50 milisecond for the connection...
};
return wsOps; return wsOps;
}); });
\ No newline at end of file
dist/app.js
View file @ 0365916a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/bower_components/components.js
View file @ 0365916a
This diff is collapsed.
dist/templates.js
View file @ 0365916a
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