Skip to content

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

quick release of changes

parent 2411c9e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 34 deletions
app/components/version/version.js
View file @ 482101ae
......@@ -5,4 +5,4 @@ angular.module('ulakbus.version', [
'ulakbus.version.version-directive'
])
.value('version', '0.6.8');
.value('version', '0.6.9');
\ No newline at end of file
app/components/version/version_test.js
View file @ 482101ae
......@@ -5,7 +5,7 @@ describe('ulakbus.version module', function() {
describe('version service', function() {
it('should return current version', inject(function(version) {
expect(version).toEqual('0.6.8');
expect(version).toEqual('0.6.9');
}));
});
});
});
\ No newline at end of file
app/zetalib/form_service.js
View file @ 482101ae
......@@ -838,6 +838,17 @@ angular.module('formService', ['ui.bootstrap'])
return result;
};
// get item unicode name from titleMap using this method
generator.item_from_array = function (item, key, array) {
var result = item;
angular.forEach(array, function (value, key) {
if (value.value === item) {
result = value.name;
}
});
return result;
};
/**
* submit function is general function for submiting forms
* @param $scope
......@@ -1022,7 +1033,7 @@ angular.module('formService', ['ui.bootstrap'])
} else {
reformattedModel[key] = {
"key": key,
"unicode": value
"unicode": Generator.item_from_array(value, key, childmodel.schema.properties[key].titleMap)
};
}
});
......
dist/app.js
View file @ 482101ae
This diff is collapsed.
dist/css/app.css
View file @ 482101ae
......@@ -384,7 +384,8 @@ select {
}
.manager-view-content {
padding:5px 40px;
width: calc(100% - 300px);
padding:25px 40px;
overflow:auto;
-webkit-flex-grow: 1;
flex-grow: 1;
......@@ -1061,15 +1062,16 @@ table.dataTable thead .sorting:after {
color:#fff;
}
.dashboard-main-search {
width: calc(100% - 300px);
.dashboard-main-search .panel-default {
padding-bottom:25px;
}
.dashboard-main-search .dashboard-student-search h3,
.dashboard-main-search .dashboard-personnel-search h3 {
font-family: 'robotoblack';
font-family: 'robotolight';
color: #5A5A5A;
letter-spacing: 1px;
font-size:16px;
}
.dashboard-main-search input {
......@@ -1180,7 +1182,6 @@ table.dataTable thead .sorting:after {
margin: 0;
font-size: 16px;
color: #666;
font-weight: bold;
font-family: 'robotobold';
text-transform: uppercase;
line-height:normal;
......@@ -1292,6 +1293,51 @@ table.dataTable thead .sorting:after {
background-color:#f5f5f5;
}
.dashboard .user-pic {
width:150px;
height:150px;
}
.dashboard .panel-default > .panel-heading {
background-color:#fff;
border-color:#F2F2F2;
font-family:'robotomedium';
color: rgb(93, 93, 93);
text-align:center;
}
.dashboard .panel-default > .panel-heading .panel-title {
font-size:18px;
}
.dashboard .user-info .user-name {
font-family:'robotomedium';
padding-top:15px;
}
.dashboard .quick-links .panel-default {
height: 274px;
}
.dashboard .quick-links .panel-body,
.dashboard .quick-links .link-buttons {
padding:0;
}
.dashboard .quick-links .link-buttons a {
padding:15px;
display:block;
color:#333;
text-decoration:none;
border-bottom: 1px solid #EFEFEF;
border-right: 1px solid #efefef;
}
.dashboard .quick-links .link-buttons a:hover {
background-color:#efefef;
}
/* END OF DASHBOARD */
......
dist/templates.js
View file @ 482101ae
......@@ -272,25 +272,46 @@ 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" +
" <div class=\"dashboard-main-search clearfix\">\n" +
"\n" +
" <div class=\"row\">\n" +
" \n" +
" \n" +
" <div class=\"row\">\n" +
" \n" +
" <div class=\"col-md-6 user-info\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <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 img-responsive\" src=\"{{$root.current_user.avatar}}\"\n" +
" alt=\"{{$root.current_user.username}}\">\n" +
" <p>{{$root.current_user.name}} {{$root.current_user.surname}}</p>\n" +
" <img class=\"img-circle user-pic\" src=\"{{$root.current_user.avatar}}\" 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" +
" <div class=\"col-md-6 quick-links\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Hızlı İşlemler</div>\n" +
" </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>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" \n" +
" </div>\n" +
" <!-- end of row -->\n" +
" \n" +
" <div class=\"dashboard-main-search clearfix\">\n" +
" \n" +
" <div class=\"row\" ng-if=\"$root.current_user.is_staff\">\n" +
"\n" +
" <div class=\"col-md-12\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Arama</div>\n" +
......@@ -345,21 +366,8 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
" </div>\n" +
" </div>\n" +
" </div>\n" +
"\n" +
" <div class=\"row\">\n" +
" <div class=\"panel panel-default\">\n" +
" <div class=\"panel-heading\">\n" +
" <div class=\"panel-title\">Hızlı İşlemler</div>\n" +
" </div>\n" +
" <div class=\"panel-body\">\n" +
" <div class=\"col-md-6 text-center\" 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}} <i class=\"fa fa-connectdevelop\"></i>\n" +
" </a>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" \n" +
" </div>\n" +
" <!-- end of dashboard-main-search -->\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