wait #4100 @0:05

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index a5cf44a73da57950b9b1a55d1028d87cb86a10cd..6ddc0a56911e1838dd847bb2f24410bb27e28f13 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -6,13 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #3135">
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles" afterDir="true" />
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" afterDir="false" />
-    </list>
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #4097 @0.25" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -467,7 +461,7 @@
       <workItem from="1575379759151" duration="1198000" />
       <workItem from="1589879021642" duration="2421000" />
       <workItem from="1595346736329" duration="5317000" />
-      <workItem from="1606322492928" duration="1212000" />
+      <workItem from="1606322492928" duration="1489000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -539,7 +533,14 @@
       <option name="project" value="LOCAL" />
       <updated>1570806981084</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="wip #4097 @0.25">
+      <created>1606325210833</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1606325210833</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TodoView">
@@ -575,41 +576,14 @@
     <MESSAGE value="fix #2243 @0:40" />
     <MESSAGE value="fix #2353 @6" />
     <MESSAGE value="wip #3135" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #3135" />
+    <MESSAGE value="wip #4097 @0.25" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #4097 @0.25" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="2069" y="315" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595347379052">
-      <screen x="1920" y="0" width="1920" height="1160" />
-    </state>
-    <state x="2069" y="315" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@1920.0.1920.1160" timestamp="1595347379052" />
-    <state x="743" y="448" width="433" height="269" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1595346997744">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="743" y="448" width="433" height="269" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@0.0.1920.1160" timestamp="1595346997744" />
-    <state x="666" y="321" key="FileChooserDialogImpl" timestamp="1589879749332">
-      <screen x="0" y="0" width="1920" height="1160" />
-    </state>
-    <state x="666" y="321" key="FileChooserDialogImpl/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@0.0.1920.1160" timestamp="1589879749332" />
-    <state width="1877" height="312" key="GridCell.Tab.0.bottom" timestamp="1595350861117">
-      <screen x="1920" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="312" key="GridCell.Tab.0.bottom/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@1920.0.1920.1160" timestamp="1595350861117" />
-    <state width="1877" height="312" key="GridCell.Tab.0.center" timestamp="1595350861117">
-      <screen x="1920" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="312" key="GridCell.Tab.0.center/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@1920.0.1920.1160" timestamp="1595350861117" />
-    <state width="1877" height="312" key="GridCell.Tab.0.left" timestamp="1595350861117">
-      <screen x="1920" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="312" key="GridCell.Tab.0.left/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@1920.0.1920.1160" timestamp="1595350861117" />
-    <state width="1877" height="312" key="GridCell.Tab.0.right" timestamp="1595350861117">
-      <screen x="1920" y="0" width="1920" height="1160" />
-    </state>
-    <state width="1877" height="312" key="GridCell.Tab.0.right/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@1920.0.1920.1160" timestamp="1595350861117" />
-    <state x="440" y="154" key="SettingsEditor" timestamp="1589880115786">
-      <screen x="0" y="0" width="1920" height="1160" />
+    <state x="862" y="107" key="CommitChangelistDialog2" timestamp="1606325194911">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
-    <state x="440" y="154" key="SettingsEditor/0.0.1920.1160/-1920.0.1920.1160/1920.0.1920.1160@0.0.1920.1160" timestamp="1589880115786" />
+    <state x="862" y="107" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1606325194911" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 2f4c1d01308a29bb81c1311cb4f255002fecda11..6eca44cfb24c92f8ba59b4169be6cb843eb5ad9e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -411,7 +411,7 @@ class wsStats
         $class = array('liste', 'max');\r
 \r
         $lines[] = array($date_creation, date(__('d-m-Y'), $book->date));\r
-        //$lines[] = array(__('Nombre de lieux de visite'), $stats['places']);\r
+        $lines[] = array(__('Nombre de lieux de visite'), $stats['places']);\r
         $lines[] = array(__('Nombre de visiteurs uniques'), $stats['visitors']);\r
         $lines[] = array(__('Nombre de visites'), $stats['visits']);\r
         $lines[] = array(__('Nombre de pages vues'), $stats['pages']);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 6f52bcd9511dc844af5d7f8d0158003cb807b540..f480a8d00ffb7ce84c582bbd6bcaa0bcf5196346 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -411,7 +411,7 @@ class wsBookParametres extends wsParametres
         $this->forms['zoom'] = array('label' => __('Zoom'),
             'fieldsnames' => array('zoomMode', '|', 'zoom', 'zoomw'));
         // .
-        $this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3);
+        $this->fields['stats'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3);
         $this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les scores dans les rapports'), 'grade' => 5);
         $this->fields['stats_exclude_ip'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Exclure les IP suivantes des statistiques'), 'grade' => 3, 'hint' => sprintf(__('Indiquer une adresse ip de la forme %s par ligne'), 'www.xxx.yyy.zzz'));
         $this->fields['relay_url_params'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Relayer les paramètres d\'url dans les liens sortants'), 'grade' => 3];