Skip to content

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

akademik takvim pop over with template 

datepicker fix
parent 36d7debb
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 91 deletions
app/components/dashboard/dashboard.html
View file @ 0bbc0140
<div ng-app="ulakbus.dashboard" class="dashboard academician-dashboard">
<div class="starter-template">
<div class="row">
<div class="col-md-12 academic-calendar-widget">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Akademik Takvim Göstergeci</div>
<div class="panel-action pull-right">Tüm Akademik Takvim</div>
</div>
<div class="panel-body">
<div class="calendar-inner">
<div class="calendar-line"></div>
<div class="date-circle-container">
<div class="date-circle">
<a class="popper" data-toggle="popover">
<div class="date-day">02</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">03</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">04</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle date-today">
<a>
<div class="date-day">05</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">06</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">07</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">08</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
</div>
<!-- end of date-circle-container -->
</div>
<!-- end of calendar-inner -->
<div class="calendar-widget-navigation">
<span class="fa fa-angle-left"></span>
<span class="fa fa-angle-right"></span>
</div>
</div>
</div>
</div>
</div>
<academic-calendar></academic-calendar>
<!--<user-tasks></user-tasks>-->
<ng-include src="'components/dashboard/user-templates/student.html'" ng-if="$root.current_user.is_student"></ng-include>
<ng-include src="'components/dashboard/user-templates/staff.html'" ng-if="!$root.current_user.is_student"></ng-include>
......
app/components/dashboard/dashboard_widgets_directives.js
View file @ 0bbc0140
......@@ -45,4 +45,15 @@ angular.module('ulakbus.dashboard')
}
}
};
});
\ No newline at end of file
})
.directive('academicCalendar', function () {
return {
templateUrl: 'components/dashboard/directives/academic-calendar.html',
restrict: 'E',
replace: true,
scope: {},
controller: function ($scope) {
}
};
});;
\ No newline at end of file
app/components/dashboard/directives/academic-calendar.html 0 → 100644
View file @ 0bbc0140
<div class="row">
<div class="col-md-12 academic-calendar-widget">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Akademik Takvim Göstergeci</div>
<div class="panel-action pull-right">Tüm Akademik Takvim</div>
</div>
<div class="panel-body">
<div class="calendar-inner">
<div class="calendar-line"></div>
<div class="date-circle-container">
<div class="date-circle">
<a class="popper" data-toggle="popover">
<div class="date-day">02</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">03</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">04</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle date-today"
popover-trigger="click"
popover-placement="bottom"
uib-popover-template="'components/dashboard/directives/calendar-popover.html'">
<a>
<div class="date-day">05</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">06</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">07</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
<div class="date-circle">
<a>
<div class="date-day">08</div>
<div class="date-month">ŞUB</div>
</a>
<div class="year">2016</div>
</div>
<!-- end of date-circle -->
</div>
<!-- end of date-circle-container -->
</div>
<!-- end of calendar-inner -->
<div class="calendar-widget-navigation">
<span class="fa fa-angle-left"></span>
<span class="fa fa-angle-right"></span>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
app/components/dashboard/directives/calendar-popover.html 0 → 100644
View file @ 0bbc0140
<div></div>
<div class="form-group">
<label>Some Title</label>
<p>some info</p>
</div>
\ No newline at end of file
app/shared/templates/datefield.html
View file @ 0bbc0140
......@@ -18,7 +18,7 @@
id="{{form.key.slice(-1)[0]}}"
ng-model-options="form.ngModelOptions"
ng-model="$$value$$"
ng-disabled="form.readonly"
ng-disabled="form.is_disabled()"
schema-validate="form"
name="{{form.key.slice(-1)[0]}}"
aria-describedby="{{form.key.slice(-1)[0] + 'Status'}}"
......
app/zetalib/form_service.js
View file @ 0bbc0140
......@@ -565,13 +565,23 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
return deferred.promise;
}
},
disabled: false,
is_disabled: function () {
return this.disabled;
},
status: {opened: false},
open: function ($event) {
this.status.opened = true;
this.disabled = true;
// scope.$apply();
scope.model[k] = Moment(scope.model[k], "DD.MM.YYYY").toDate();
var that = this;
$timeout(function () {
that.status.opened = true;
}, 100);
},
format: 'dd.MM.yyyy',
onSelect: function () {
this.disabled = false;
scope.model[k] = angular.copy(generator.dateformatter(scope.model[k]));
}
};
......
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