wip #4211 @0.5

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b92d4f78bf5c17345c77d6d7129c8724b4f7e84..4fe7c895880fe5638990a4324a8e31aac36e4b1f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,6 +24,7 @@
   <component name="ChangeListManager">
     <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #4211 @1">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Console/Commands/Precache.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/Precache.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Console/Commands/WorkshopMigration.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/WorkshopMigration.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Models/FluidbookPublication.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/FluidbookPublication.php" afterDir="false" />
     </list>
@@ -696,14 +697,8 @@
       <workItem from="1646312342244" duration="162000" />
       <workItem from="1646312529624" duration="5350000" />
       <workItem from="1646330633143" duration="4391000" />
-      <workItem from="1646655005312" duration="12220000" />
-    </task>
-    <task id="LOCAL-00214" summary="wait #4962 @0.25">
-      <created>1639734517141</created>
-      <option name="number" value="00214" />
-      <option name="presentableId" value="LOCAL-00214" />
-      <option name="project" value="LOCAL" />
-      <updated>1639734517141</updated>
+      <workItem from="1646655005312" duration="12287000" />
+      <workItem from="1646731397747" duration="3638000" />
     </task>
     <task id="LOCAL-00215" summary="wait #4977 @0.25">
       <created>1640247316541</created>
@@ -1041,7 +1036,14 @@
       <option name="project" value="LOCAL" />
       <updated>1646670148342</updated>
     </task>
-    <option name="localTasksCounter" value="263" />
+    <task id="LOCAL-00263" summary="wip #4211 @1">
+      <created>1646676664104</created>
+      <option name="number" value="00263" />
+      <option name="presentableId" value="LOCAL-00263" />
+      <option name="project" value="LOCAL" />
+      <updated>1646676664104</updated>
+    </task>
+    <option name="localTasksCounter" value="264" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/app/Console/Commands/Precache.php b/app/Console/Commands/Precache.php
index d85cdf487a3c857f7115abb6afd383aa9e069ec6..f708f335fa2989ec593dc5a3bb287e653ea12c43 100644 (file)
--- a/app/Console/Commands/Precache.php
+++ b/app/Console/Commands/Precache.php
@@ -8,6 +8,7 @@ use App\Models\ELearningMedia;
 use App\Models\ELearningPackage;
 use App\Models\FluidbookCollection;
 use App\Models\FluidbookIconset;
+use App\Models\FluidbookPublication;
 use App\Models\FluidbookQuote;
 use App\Models\FluidbookTheme;
 use App\Models\FluidbookTranslate;
@@ -31,6 +32,7 @@ class Precache extends CubistCommand
             'Cache user data' => 'class:' . User::class,
             'Cache company data' => 'class:' . Company::class,
             'Cache permissions data' => 'permissions',
+            'Cache fluidbook publication data' => 'class:' . FluidbookPublication::class,
             'Cache fluidbook quote data' => 'class:' . FluidbookQuote::class,
             'Cache fluidbook theme data' => 'class:' . FluidbookTheme::class,
             'Cache fluidbook icon set data' => 'class:' . FluidbookIconset::class,

diff --git a/app/Console/Commands/WorkshopMigration.php b/app/Console/Commands/WorkshopMigration.php
index daf2a98989a4398663bda4fad8b4bae9138e5637..61b07ddfd4a1b627012a82579a0fb0d2802ad00f 100644 (file)
--- a/app/Console/Commands/WorkshopMigration.php
+++ b/app/Console/Commands/WorkshopMigration.php
@@ -95,9 +95,7 @@ class WorkshopMigration extends CubistCommand
             'changedate' => 'updated_at',
             'compiledate' => 'compilation_date',
             'composition_update' => 'composition_update_at',
-            'dir_external' => 'install_ftp_settings',
-            'dir_hosting' => 'install_hosting_settings',
-            'dir_references' => 'install_references_settings',
+            'exportdatas' => 'export_data',
         ];
 
         $mapValues = ['Open Sans (police du Fluidbook)' => 'OpenSans'];
@@ -107,10 +105,10 @@ class WorkshopMigration extends CubistCommand
         $this->line('Begin publications migration');
 
         FluidbookTheme::$updateWS2ViewOnChange = false;
-        foreach (FluidbookPublication::lazy() as $book) {
-            $this->line('Delete ' . $book->id);
-            $book->delete();
-        }
+//        foreach (FluidbookPublication::lazy() as $book) {
+//            $this->line('Delete ' . $book->id);
+//            $book->delete();
+//        }
         FluidbookPublication::truncate();
 
         foreach (DB::table($this->_oldDB . '.books')->get() as $e) {

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index c59df3ba6671b2a6c1d914eaf2b88512e5c31d03..4b7005f43a9118c8e7a35bde9a8867fffb6d804b 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -86,9 +86,7 @@ class FluidbookPublication extends ToolboxModel
         $this->addField('extranet_task', Integer::class, __('Tâche de l\'extranet'));
         $this->addField('compilation_date', Datetime::class, __('Dernière compilation'));
         $this->addField('composition_updated_at', Datetime::class, __('Dernière modification de la composition'));
-        $this->addField('install_ftp_settings', LongText::class, __('Paramètres Installation FTP'));
-        $this->addField('install_hosting_settings', LongText::class, __('Paramètres Installation Hosting'));
-        $this->addField('install_references_settings', LongText::class, __('Paramètres Installation Résferences'));
+        $this->addField('export_data', Hidden::class, __('Paramètres d\'export'));
 
         $this->setSettingsFields();
     }