put vertical space between events

[angular-mojolicious.git] / public / app / reservations / calendar.html

diff --git a/public/app/reservations/calendar.html b/public/app/reservations/calendar.html
index f947f21..5dec238 100644 (file)
--- a/public/app/reservations/calendar.html
+++ b/public/app/reservations/calendar.html
@@ -9,15 +9,15 @@
    ng:autobind></script>
 
 <script>
-Calendar.$inject = ['$xhr', '$resource']; 
+Calendar.$inject = ['$xhr', '$resource','$log'];
 
-function Calendar($xhr,$resource){ 
-       console.info('Calendar');
+function Calendar($xhr,$resource,$log){ 
+       $log.info('Calendar');
        var self = this;
        $xhr("GET"
                , "/reservations/get/www.google.com/calendar/ical/8tg8ecg285qshtp75813jktqa0%40group.calendar.google.com/private-b9d68b530fde2c6060979f8a05aa0865/basic.ics"
                , function(code, response){ 
-                       console.log('xhr calendar', code, response);
+                       $log.log('xhr calendar', code, response);
                        self.data = response;
                }
        );
@@ -29,7 +29,7 @@ function Calendar($xhr,$resource){
                $xhr("GET"
                        , "/reservations/events/submited"
                        , function(code, response){ 
-                               console.log('xhr submited', code, response);
+                               $log.log('xhr submited', code, response);
                                self.submited = response;
                        }
                );
@@ -39,7 +39,7 @@ function Calendar($xhr,$resource){
        self.reservation.status = 'event';
 
        this.select_event = function(c) {
-               console.info('select_event', c);
+               $log.info('select_event', c);
                self.reservation.event = c;
                self.reservation.status = 'changed';
                if (self.submited) self.reservation.slot_nr = ++self.submited[c.UID];
@@ -53,12 +53,12 @@ function Calendar($xhr,$resource){
 
        this.save_submission = function() {
                if ( self.reservation && self.reservation.event ) {
-                       console.info('submit save');
+                       $log.info('submit save');
                        self.reservation.status = 'saved';
                        self.reservation.$save();
                        self.load_submited();
                } else {
-                       console.info('submit ignored');
+                       $log.info('submit ignored');
                }
        }
 
@@ -70,6 +70,9 @@ function Calendar($xhr,$resource){
 <title>Reservations</title>
 
 <style>
+li {
+       margin-bottom: 1em;
+}
 </style>
 
 </head>
@@ -84,12 +87,18 @@ function Calendar($xhr,$resource){
 <ul>
 <li ng:repeat="c in data.events" ng:show="reservation.status == 'event'">
 {{c.DTSTART}} - {{c.DTEND}}
-<a href="" ng:click="select_event(c)" ng:show="! reservation.event && c.UID != reservation.event.UID">{{c.SUMMARY}}</a>
-<b ng:show="reservation.event && reservation.event.UID == c.UID">{{c.SUMMARY}}</b>
-<em ng:show="submited[c.UID]">
-broj prijava: {{submited[c.UID]}}
-</em>
-<em ng:show="c.slots">/{{c.slots}}</em>
+
+<span ng:show="! submited[c.UID] || submited[c.UID] < c.slots">
+ <a href="" ng:click="select_event(c)">{{c.SUMMARY}}</a>
+ <em ng:show="submited[c.UID]">prijava: {{submited[c.UID]}}</em>
+ <em ng:show="c.slots">mjesta: {{c.slots}}</em>
+</span>
+
+<span ng:show="submited[c.UID] >= c.slots">
+ <b>{{c.SUMMARY}}</b>
+ <em>popunjena sva mjesta: {{c.slots}}</em>
+</span>
+
 <div>{{c.LOCATION}}</div>
 <div ng:show="c.DESCRIPTION">
 {{c.DESCRIPTION}}