Merge branch '90-initialise-angabe-des-ordners-ohne-effekt' into 'development'

Resolve "Initialise: Angabe des Ordners ohne Effekt"

See merge request !36

+PlotID/@config/config.m

@@ -12,6 +12,7 @@ classdef config < handle
     properties (SetAccess = protected)
         configData
         configFileName
+        exportPath = ''
     end
     
     methods
@@ -23,7 +24,10 @@ classdef config < handle
               txt = fileread(obj.configFileName);
               obj.configData = jsondecode(txt);
               assert(checkConfig(obj));        
-           
+              if isfield(obj.configData,'ExportPath')
+                  obj.exportPath = obj.configData.ExportPath;
+                  obj.configData.options.Location = 'exportPath';
+              end
             catch 
                 msg = ['no valid config File with the filename ',...
                     obj.configFileName, ' found.' newline,...

+PlotID/@config/wizard.m

@@ -15,7 +15,7 @@ switch mode
         m = input('Do you want to add an export path? Y/N [Y]:','s');
 
         if ismember(m,{'Y','y'})
-           config.ServerPath = uigetdir();
+           config.ExportPath = uigetdir();
         end
     otherwise
         error('wizard mode undefined in CLASS config');

+PlotID/Publish.m

@@ -74,9 +74,13 @@ end
 %% read config file
 % there is only one config Object (handleClass)
 configObj = PlotID.config(options.ConfigFileName);
+% add user options 
 if isfield(configObj.configData, 'options')
-   % is working but prune to user errors 
-   options = configObj.configData.options;
+   fldnames = fieldnames(configObj.configData.options);
+   for ii=1:numel(fldnames) 
+      field = fldnames{ii};
+      options.(field) = configObj.configData.options.(field);
+   end
 end
 
 % Error and MSG handeling
@@ -92,14 +96,22 @@ switch options.Location
             % use the script path as export path
             scriptLocation = fileparts(scriptPath);
             storPath = fullfile(scriptLocation,options.ParentFolder);
+        end    
+    case 'exportPath' %legacy
+        if isfolder(configObj.exportPath)
+           storPath = configObj.exportPath;
+        else
+           msg = ['Your Export folder ', storPath, newline,...
+                'does not exist, check the config file - publishing  not possible!'];         
+           dlgObj.error(msg);
         end
-    case 'server' %from config File
+    case 'server' %legacy
         if dlgObj.configError
             msg = ['Error while reading the config file' newline,...
                 ' publishing on server not possible'];         
             dlgObj.error(msg);
         end
-        storPath = config.ServerPath;
+        storPath = configObj.configData.ServerPath;
     case 'manual' %UI
         storPath = uigetdir();
     case 'CI-Test'
@@ -233,17 +245,6 @@ catch
    dlgObj.softError('Plot export was not successful');
 end
 
-% CSV EXport
-if options.CSV
-  T = table();
-  T.research_Data = DataPaths'; T.PlotID(:) = {ID};
-  T.Script_Name(:) = {scriptPath};
-  T.Storage_Location(:) = {storPath};
-  T.Date(:) = {datestr(now)};
-  T = movevars(T,'PlotID','before',1);
-  writetable(T, fullfile(storPath, 'overview_table.csv'),'WriteMode','append');
-end
-
 %% final renaming and error/warning handeling
 % if no error orcurred or if force publish is activated, rename the hidden
 % folder to a non hidden one, otherwise delete it.
@@ -257,8 +258,21 @@ if dlgObj.success || options.ForcePublish
     status = movefile(oldPath,newPath); %rename directory
 end
 
+%% CSV EXport
+% ToDo exclude in function
+if options.CSV
+  T = table();
+  T.research_Data = DataPaths'; T.PlotID(:) = {ID};
+  T.Author(:) = {configObj.configData.Author};
+  T.Script_Name(:) = {scriptPath};
+  T.Storage_Location(:) = {newPath};
+  T.Date(:) = {datestr(now)};
+  T = movevars(T,{'PlotID','Author'},'before',1);
+  writetable(T, fullfile(storPath, 'PlotID_overview.csv'),'WriteMode','append');
+end
+
 if status 
-    disp(['publishing of ', ID , ' done']); %always displayed onsucess   
+    disp(['publishing of ', ID , ' to ', newPath, ' done']); %always displayed onsucess   
 else % publish was not sucessfull! 
     %replace with error from userDLG Class
     dlgObj.error(['publishing of ', ID , ' failed'])