correct version

OnePlc · Feb 1, 2020 · d859802 · d859802
1 parent cc2df15
commit d859802
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 331 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "oneplace/oneplace-core",
     "description": "onePlace Core Application",
     "type": "project",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "license": "BSD-3-Clause",
     "keywords": [
         "laminas",

diff --git a/module/Application/src/Controller/CoreEntityController.php b/module/Application/src/Controller/CoreEntityController.php
@@ -135,6 +135,9 @@ protected function generateAddView($sKey,$sSingleForm = '') {
         # Save Multiselect
         $this->updateMultiSelectFields($_REQUEST,$oSkeletonBasedObject,$sKey.'-single');
 
+        # Add XP for creating a new entity
+        CoreController::$oSession->oUser->addXP($sKey.'-add');
+
         # Log Performance in DB
         $aMeasureEnd = getrusage();
         $this->logPerfomance($sKey.'-save',$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"utime"),$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"stime"));
@@ -257,6 +260,9 @@ public function generateEditView($sKey,$sSingleForm = '') {
         # Save Multiselect
         $this->updateMultiSelectFields($aFormData,$oSkeleton,$sKey.'-single');
 
+        # Add XP for creating a new entity
+        CoreController::$oSession->oUser->addXP($sKey.'-edit');
+
         # Log Performance in DB
         $aMeasureEnd = getrusage();
         $this->logPerfomance($sKey.'-save',$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"utime"),$this->rutime($aMeasureEnd,CoreController::$aPerfomanceLogStart,"stime"));

diff --git a/module/Application/src/Controller/CoreExportController.php b/module/Application/src/Controller/CoreExportController.php
@@ -60,7 +60,7 @@ public function __construct(AdapterInterface $oDbAdapter,$oTableGateway,$oServic
      * @return array
      * @since 1.0.5
      */
-    public function exportSkeletonBasedData($sTitle,$sKey) {
+    public function exportData($sTitle,$sKey) {
         $this->sSingleForm = $sKey.'-single';
 
         # set dump export mode
@@ -69,13 +69,13 @@ public function exportSkeletonBasedData($sTitle,$sKey) {
 
         # Set document properties
         $spreadsheet->getProperties()
-            ->setCreator('Maarten Balliauw')
-            ->setLastModifiedBy('Maarten Balliauw')
+            ->setCreator(CoreController::$oSession->oUser->getLabel())
+            ->setLastModifiedBy(CoreController::$oSession->oUser->getLabel())
             ->setTitle($sTitle)
-            ->setSubject('Export of all Skeleton Data')
-            ->setDescription('This file contains all data of module article and its entities')
-            ->setKeywords('skeleton export')
-            ->setCategory('Skeleton Export');
+            ->setSubject('Export of all '.$sTitle.' Data')
+            ->setDescription('This file contains all data of module '.$sTitle)
+            ->setKeywords($sKey.' export')
+            ->setCategory($sTitle.' Export');
 
         # Add some data
         $spreadsheet->setActiveSheetIndex(0);
@@ -200,10 +200,13 @@ public function exportSkeletonBasedData($sTitle,$sKey) {
         $writer = new Xlsx($spreadsheet);
         $writer->save($sPath);
 
+        # Add XP for creating an export
+        CoreController::$oSession->oUser->addXP($sKey.'-export');
+
         sleep(1);
 
         return [
-            'href'=>'/data/skeleton/export/test.xlsx',
+            'href'=>'/data/'.$sKey.'/export/test-core.xlsx',
             'label'=>'Download Excel File',
             'icon'=>'fas fa-download',
             'class'=>'btn-primary',

diff --git a/module/Application/src/Controller/CoreSearchController.php b/module/Application/src/Controller/CoreSearchController.php
@@ -66,6 +66,8 @@ public function __construct(AdapterInterface $oDbAdapter,$oTableGateway,$oServic
      * @since 1.0.5
      */
     public function generateSearchView($sKey) {
+        $this->sSingleForm = $sKey.'-single';
+
         # Set Layout based on users theme
         $this->setThemeBasedLayout($sKey);
 

diff --git a/module/Application/src/Module.php b/module/Application/src/Module.php
@@ -24,9 +24,9 @@ class Module {
     /**
      * Module Version
      *
-     * @since 1.0.7
+     * @since 1.0.8
      */
-    const VERSION = '1.0.7';
+    const VERSION = '1.0.8';
 
     public function getConfig() : array {
         return include __DIR__ . '/../config/module.config.php';