Merge pull request #52 from erz-mba-fbi/develop

v3.1.0

README.md

@@ -1,5 +1,5 @@
-# kursausschreibung 3.0.2
-
+# kursausschreibung 3.1.0
+=======
 [![Build Status](https://travis-ci.org/erz-mba-fbi/kursausschreibung.svg?branch=master)](https://travis-ci.org/erz-mba-fbi/kursausschreibung)
 
 ## Prerequisites

app/components/input/input-date.js

@@ -1,4 +1,11 @@
 import Component from '@ember/component';
+import { dateGreaterNow} from 'kursausschreibung/framework/date-helpers';
+import { formDanger } from 'kursausschreibung/helpers/form';
 
 export default Component.extend({
+    change() {
+        if (this.field.id === 'Birthdate') {
+            formDanger(this.element.children[0],dateGreaterNow(this.element.children[0].value));
+        }
+      },
 });

app/components/input/input-string.js

@@ -1,4 +1,21 @@
 import Component from '@ember/component';
+import { getLocationFromZip, helperSocialSecurityNumber } from 'kursausschreibung/helpers/form';
 
 export default Component.extend({
+    focusIn() {
+        if (this.field.id === 'Location') {
+             getLocationFromZip();
+        }
+      },
+      change() {
+          if (this.field.id === 'SocialSecurityNumber') {
+            helperSocialSecurityNumber(this.element.children[0]);
+          }
+
+      },
+      keyUp(){
+          if (this.field.id === 'SocialSecurityNumber') {
+            helperSocialSecurityNumber(this.element.children[0]);
+          }
+      }
 });

app/components/subscription-form.js

@@ -11,7 +11,7 @@ export default Component.extend({
 
       subscribe(this.$('form'), this);
       this.get('subscribe')();
-    }
+    }  
   }
 });
 

app/framework/date-helpers.js

@@ -68,6 +68,20 @@ export function isInSubscriptionRange(event) {
     now.getTime() < parse(event.SubscriptionTo).getTime();
 }
 
+/**
+ * return true when the DateFrom greater or equal
+ * to current date is. If DateFrom null then current date
+ * @param {object} event event to check
+ */
+export function eventStarted(event) {
+  let now = new Date();
+  if (event.DateFrom === null) {
+    return now.getTime() === now.getTime();
+  } 
+  return parse(event.DateFrom).getTime() >= now.getTime();
+}
+
+
 /**
  * combine a date and a time to a single date object
  * this returns null when it fails
@@ -123,4 +137,12 @@ export function getYMD(dateString) {
  */
 export function getDateTimeForIcs(dateString) {
   return dateString.replace(new RegExp('-', 'g'), '/').replace(new RegExp('T', 'g'), ' ');
+}
+
+/**
+ * returns true if date > now
+ * @param {string} dateString YYYY-MM-DD
+ */
+export function dateGreaterNow(date){
+    return Date.parse(date) > Date.now() ? true : false;
 }

app/framework/status.js

@@ -20,8 +20,7 @@ let isGreen = createStatusCallback(settings.lampIsGreen, function (event) {
     event.AllowSubscriptionInternetByStatus &&
     event.TypeOfSubscription !== 1 &&
     isInSubscriptionRange(event) &&
-    event.FreeSeats > 0 &&
-    (event.MaxParticipants - event.FreeSeats) < event.MinParticipants
+    ((event.FreeSeats > 0) && ((event.MaxParticipants - event.FreeSeats) < event.MinParticipants) || event.EventTypeId === 1)
   );
 });
 

app/framework/store.js

@@ -5,7 +5,7 @@ import $ from 'jquery';
 import { getEvents, getEvent, getLessons, getEventLocations, getEventTexts } from './api';
 import { isGreen, isChartreuse, isYellow, isRed } from './status';
 import ObjectProxy from '@ember/object/proxy';
-import { formatDate, combineDate, isInSubscriptionRange, removeMinutes } from './date-helpers';
+import { formatDate, combineDate, isInSubscriptionRange, removeMinutes, eventStarted } from './date-helpers';
 import { all } from 'rsvp';
 import settings from './settings';
 import { getLanguage, getString } from './translate';
@@ -59,6 +59,14 @@ export function init() {
     getEventTexts(language)
   ]).then(function ([events, lessons, eventLocations, eventTexts]) {
 
+    // remove null-values (temporary fix, see #50)
+    /*let removeNull = array => array.filter(element => element !== null);
+        
+    events = removeNull(events);
+    lessons = removeNull(lessons);
+    eventLocations = removeNull(eventLocations);
+    eventTexts = removeNull(eventTexts);
+    */
     // filter events
     events = filterEvents(events, language);
 
@@ -209,6 +217,7 @@ function filterEvents(events, language) {
       (event.LanguageOfInstruction === 'Französisch' && language === 'en-US'));
   }
 
+  events = events.filter(event => eventStarted(event));
   return events;
 }