Fixed issue #13059: Display issue - Export CPDB

LimeSurvey · Dec 22, 2017 · d64a997 · d64a997
1 parent cce45fe
commit d64a997
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 66 deletions.
diff --git a/application/views/admin/participants/modal_subviews/_exportCSV.php b/application/views/admin/participants/modal_subviews/_exportCSV.php
@@ -0,0 +1,78 @@
+<div id="exportcsv" title="exportcsv" role="dialog" tabindex="-1" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title"><?php eT("Export participants"); ?> </h4>
+            </div>
+            <div class="modal-body">
+                <div class="form container-center">
+                    <div class='form-group row'>
+                        <label class='control-label col-sm-4' for='attributes'><?php eT('Attributes to export:');?></label>
+                        <div class='col-sm-8'>
+                            <select id="attributes" name="attributes" multiple="multiple" >
+                                <?php
+                                foreach ($aAttributes as $value)
+                                {
+                                    echo "<option value=" . $value['attribute_id'] . ">" . $value['defaultname'] . "</option>\n";
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+                <?php if (Yii::app()->getConfig('hideblacklisted') != 'N'): ?>
+                    <div class='alert alert-info'>
+                        <p><span class='fa fa-info-circle'></span>&nbsp;<?php eT('If you want to export blacklisted participants, set "Hide blacklisted participants" to "No" in CPDB settings.'); ?></p>
+                    </div>
+                <?php endif; ?>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal"><?php eT('Close'); ?></button>
+                <button type="button" class="btn btn-default exportButton"><?php eT('Export'); ?></button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div id='exportcsvallprocessing' title='exportcsvall' style='display:none'>
+    <p><?php eT('Please wait, loading data...');?></p>
+    <div class="preloader loading">
+        <span class="slice"></span>
+        <span class="slice"></span>
+        <span class="slice"></span>
+        <span class="slice"></span>
+        <span class="slice"></span>
+        <span class="slice"></span>
+    </div>
+</div>
+
+<div id='exportcsvallnorow' title='exportcsvallnorow' role="dialog" tabindex="-1" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title"><?php eT("Export participants"); ?></h4>
+            </div>
+            <div class="modal-body">
+                <?php eT("There are no participants to be exported."); ?>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal"><?php eT('Close'); ?></button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<?php
+    App()->getClientScript()->registerScript('ExportCSVMultiSelectInit', "
+    $('#attributes').multiselect({
+        includeSelectAllOption: true, 
+        enableFiltering: true,
+        enableCaseInsensitiveFiltering: true, 
+        filterBehavior : \"text\",
+        selectAllText: '".gT("Select all")."',
+        filterPlaceholder: '".gT("Search for something...")."'
+    });
+    ", LSYii_ClientScript::POS_POSTSCRIPT);
+?>
diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
@@ -139,69 +139,8 @@
   </div>
 </div>
 
+<?php 
+    $aModalData = ['aAttributes' => $aAttributes];
+    App()->getController()->renderPartial('/admin/participants/modal_subviews/_exportCSV', $aModalData);
+?>
 
-<div id='exportcsvallprocessing' title='exportcsvall' style='display:none'>
-    <p><?php eT('Please wait, loading data...');?></p>
-    <div class="preloader loading">
-        <span class="slice"></span>
-        <span class="slice"></span>
-        <span class="slice"></span>
-        <span class="slice"></span>
-        <span class="slice"></span>
-        <span class="slice"></span>
-    </div>
-</div>
-<div id='exportcsvallnorow' title='exportcsvallnorow' role="dialog" tabindex="-1" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title"><?php eT("Export participants"); ?></h4>
-            </div>
-            <div class="modal-body">
-                <?php eT("There are no participants to be exported."); ?>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal"><?php eT('Close'); ?></button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<?php // TODO: Move modal to separate view ?>
-<div id="exportcsv" title="exportcsv" role="dialog" tabindex="-1" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title"><?php eT("Export participants"); ?> </h4>
-            </div>
-            <div class="modal-body">
-                <div class="form ">
-                    <div class='form-group'>
-                        <label class='control-label col-sm-4' for='attributes'><?php eT('Attributes to export:');?></label>
-                        <div class='col-sm-8'>
-                            <select id="attributes" name="attributes" multiple="multiple" style='width: 350px' size=7>
-                                <?php
-                                foreach ($aAttributes as $value)
-                                {
-                                    echo "<option value=" . $value['attribute_id'] . ">" . $value['defaultname'] . "</option>\n";
-                                }
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-                <?php if (Yii::app()->getConfig('hideblacklisted') != 'N'): ?>
-                    <div class='alert alert-info'>
-                        <p><span class='fa fa-info-circle'></span>&nbsp;<?php eT('If you want to export blacklisted participants, set "Hide blacklisted participants" to "No" in CPDB settings.'); ?></p>
-                    </div>
-                <?php endif; ?>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal"><?php eT('Close'); ?></button>
-                <button type="button" class="btn btn-default exportButton"><?php eT('Export'); ?></button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/assets/packages/adminbasics/css/lime-admin-common.css b/assets/packages/adminbasics/css/lime-admin-common.css
@@ -2097,7 +2097,9 @@ table#responsedetail tr td{
 .input-group-addon {
   padding: 5px 12px;
 }
-
+.multiselect-container>li>a>label>input[type="checkbox"]{
+  margin-left: 0;
+}
 .notification-list {
   top: 100%;
   left: 0;