Merge pull request #133 from bkd-mba-fbi/develop

Lyss Patch

README.md

@@ -1,4 +1,4 @@
-# kursausschreibung 3.3.1
+# kursausschreibung 3.3.2
 [![Build 🏭🚀](https://github.com/bkd-mba-fbi/kursausschreibung/actions/workflows/buildDeploy.yml/badge.svg)](https://github.com/bkd-mba-fbi/kursausschreibung/actions/workflows/buildDeploy.yml)
 ## Prerequisites
 

app/components/input/input-file.js

@@ -31,7 +31,6 @@ export default Component.extend({
     }
     else {
 
-      this.set('field.fileLabelBevorFileChoose', this.get('field.fileTypeLabel'));
       this.set('field.fileTypeLabel', inputFile.name);
       this.set('field.fileObject', inputFile);
 
@@ -65,7 +64,7 @@ export default Component.extend({
 
 
         var basic = jQuery('#img'+ this.field.id).croppie({
-          viewport: { width: 296, height: 396 },
+          viewport: { width: 300, height: 400 },
           boundary: { width: 350, height: 450 },
         });
 
@@ -90,6 +89,12 @@ export default Component.extend({
       let elementIdFile = getElementIdFile(fieldId);
       let buttonClassDel = document.getElementById('fileBtDel' + fieldId);
       buttonClassDel.classList.add('uk-hidden');
+
+      if (this.get('field.options.required')) {
+        let buttonClass = document.getElementById('fileBt' + this.field.id);
+        buttonClass.classList.add('required');
+      }
+
       let imgClassDel = document.getElementById('img' + fieldId);
       imgClassDel.classList.add('uk-hidden');
       let imgClassUp = document.getElementById('fileBtUpload' + fieldId);
@@ -109,7 +114,8 @@ export default Component.extend({
             let inputFile = getInputFile(fieldId);
             basic.croppie('result', {
               type: 'base64',
-              format: 'jpeg'            
+              format: 'jpeg',
+              size: {width: '300', height: '400'}
             }).then(function(base64) {
               // html is div (overflow hidden)
               // with img positioned inside.

app/framework/date-helpers.js

@@ -79,16 +79,20 @@ export function eventStarted(event) {
 }
 
 /**
- * return true if DateTo is smaller than or equal
- * to the current date
+ * return true if DateTo + TimeTo is smaller than or equal
+ * to the current datetime
  * @param {object} event event to check
  */
 export function eventEnded(event) {
   let now = new Date();
-  if (event.DateTo === null) {
-    return true;
+  let dateTo = event.DateTo;
+  let repalcePattern = '00:00:00';
+  if (dateTo === null) {
+    return false;
   }
-  return parseISO(event.DateTo).getTime() <= now.getTime();
+
+  dateTo = dateTo.search(repalcePattern) > 0 ? dateTo.replace(repalcePattern,event.TimeTo) : dateTo;
+  return parseISO(dateTo).getTime() <= now.getTime();
 }
 
 /**

app/framework/storage.js

@@ -24,8 +24,7 @@ let [
   [getCulture, setCulture],
   [getAccessToken, setAccessToken],
   [getRefreshToken, setRefreshToken],
-  [getTokenExpire, setTokenExpire],
-  [getDataToSubmit, setDataToSubmit]
+  [getTokenExpire, setTokenExpire]
 ] = [
   'uiCulture',
   'CLX.LoginToken',
@@ -38,6 +37,13 @@ export {
   getCulture, setCulture,
   getAccessToken, setAccessToken,
   getRefreshToken, setRefreshToken,
-  getTokenExpire, setTokenExpire,
-  getDataToSubmit, setDataToSubmit
+  getTokenExpire, setTokenExpire
 };
+
+export function getDataToSubmit(){
+  return window.kursausschreibung.dataToSubmit;
+}
+
+export function setDataToSubmit(dataToSubmit){
+  window.kursausschreibung.dataToSubmit = dataToSubmit;
+}

app/index.html

@@ -12,6 +12,7 @@
   <meta name="Description" content="Kursmodul">
   <!-- MODULE head configuration -->
   {{content-for "head"}}
+  <meta name="kursausschreibung/config/environment" content="%7B%22modulePrefix%22%3A%22kursausschreibung%22%2C%22environment%22%3A%22development%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22rootElement%22%3A%22%23kursausschreibung-root%22%2C%22name%22%3A%22kursausschreibung%22%2C%22version%22%3A%223.3.1%2Bfeef2e77%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
 
   <!-- CSS -->
   <link rel="stylesheet" href="{{rootURL}}assets/app.css">

app/routes/list/category/event/confirmation.js

@@ -58,7 +58,7 @@ export default Route.extend({
           if(additionalPeople.length > 0 ){
             subscriptionData.SubscriptionDetails.push({VssId: SUBSCRIPTION_DETAIL_ALLOW_MULTIPLE_PEOPLE , Value: additionalPeople.length });
           }
-          postSubscription(subscriptionData).then(id => {
+          return postSubscription(subscriptionData).then(id => {
             subscriptionFiles.forEach(file => {
 
               let data = {
@@ -73,7 +73,6 @@ export default Route.extend({
             promises.push(postSubscriptionDetailsFiles(data,file));
 
             });
-            return promises;
           });
         });
 
@@ -138,6 +137,12 @@ function createPerson(addressData) {
     );
   }
 
+  // delete keys with null-values
+  Object.keys(addressData).forEach(key => {
+    if (addressData[key] === null)
+      delete addressData[key];
+  });
+
   return new Promise(resolve => postPerson(addressData)
     .then((_data, _status, xhr) => { resolve([xhr]); }))
     .then(([xhr]) => { // xhr is in an array so it gets correctly passed along
@@ -152,15 +157,12 @@ function createPerson(addressData) {
         // the person already exists and must get updated
         let personId = duplicateHeader.split('/').slice(-1)[0];
 
-        // delete keys with null-values
-        Object.keys(addressData).forEach(key => {
-          if (addressData[key] === null)
-            delete addressData[key];
-        });
-
         // add id
         addressData.Id = parseInt(personId);
 
+        //On duplicat Person itz not allowed to update SocialSecurityNumber
+        delete addressData.SocialSecurityNumber;
+
         return putPerson(addressData, personId)
           .then(() => personId)
           .catch(error => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kursausschreibung",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "private": true,
   "description": "Evento JS Module for online course announcement",
   "license": "MIT",