Migrations: Fix errors in search diagnosis - refs BT#20846

pull/4823/head
christian 2 years ago
parent 821adb659b
commit 959f82eb18
  1. 12
      assets/css/app.scss
  2. 1
      public/main/inc/lib/extra_field_value.lib.php
  3. 4
      public/main/inc/lib/formvalidator/Element/DatePicker.php
  4. 79
      public/main/inc/lib/formvalidator/FormValidator.class.php
  5. 4
      src/CoreBundle/Settings/PlatformSettingsSchema.php

@ -16,7 +16,13 @@
@layer utilities {
.custom-collapse {
visibility: visible;
display: none;
}
.custom-collapse.active {
display: block;
}
.collapse {
visibility: inherit !important;
}
}
@ -189,8 +195,8 @@
//@import '~primeflex/primeflex.css';
//@import "~primeicons/primeicons.css";
@import 'primeflex/core/_variables.scss';
@import 'primeflex/core/_formlayout.scss';
@import 'primeflex/src/_variables.scss';
@import 'primeflex/src/_formlayout.scss';
//@import "~jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
@import "~@fancyapps/fancybox/dist/jquery.fancybox.css";

@ -725,6 +725,7 @@ class ExtraFieldValue extends Model
$result = Database::query($sql);
if (Database::num_rows($result)) {
$result = Database::fetch_array($result, 'ASSOC');
$result['value'] = $result['field_value'];
if ($transform) {
$fieldType = $result['value_type'];
if (ExtraField::FIELD_TYPE_DOUBLE_SELECT == $fieldType) {

@ -47,10 +47,10 @@ class DatePicker extends HTML_QuickForm_text
class="form-control border" type="text" value="'.$value.'" placeholder="'.get_lang('Select date ..').'" data-input>
<div class="ml-1" id="button-addon3">
<button class="btn btn--secondary-outline" type="button" data-toggle>
<i class="fas fa-calendar-alt"></i>
<i class="pi pi-calendar pi-lg"></i>
</button>
<button class="btn btn--secondary-outline" type="button" data-clear>
<i class="fas fa-times"></i>
<i class="pi pi-times pi-lg"></i>
</button>
</div>
</div>

@ -1012,49 +1012,48 @@ EOT;
public function addStartPanel(string $id, string $title, bool $open = false)
{
$parent = null;
$html = '
<script>
document.addEventListener("DOMContentLoaded", function() {
const query = window.location.hash.replace("#", "#collapse_");
if (query) {
const selected = document.querySelector(query);
if (selected) {
if (selected.classList.contains("hidden")) {
selected.classList.remove("hidden");
$javascript = '
<script>
document.addEventListener("DOMContentLoaded", function() {
const buttons = document.querySelectorAll("#card_'.$id.' a");
const menus = document.querySelectorAll("#collapse_'.$id.'");
buttons.forEach((button, index) => {
button.addEventListener("click", function() {
menus.forEach((menu, menuIndex) => {
if (index === menuIndex) {
menu.classList.toggle("active");
} else {
menu.classList.remove("active");
}
}
}
const button = document.querySelector("#card_'.$id.'");
button.addEventListener("click", (e) => {
let menu = document.querySelector("#collapse_'.$id.'");
if (menu.classList.contains("hidden")) {
menu.classList.remove("hidden");
} else {
menu.classList.add("hidden");
}
});
});
});
</script>
<div class="mt-4 rounded-lg">
<div class="px-4 bg-gray-100 border border-gray-50 custom-collapse" id="card_'.$id.'">
<h5>
<a role="button"
class="'.(($open) ? 'collapse' : ' ').'"
data-toggle="collapse"
data-target="#collapse_'.$id.'"
aria-expanded="true"
aria-controls="collapse_'.$id.'"
>
'.$title.'
</a>
</h5>
</div>
<div
id="collapse_'.$id.'"
class="px-4 border border-gray-50 bg-white hidden collapse custom-collapse '.(($open) ? 'show' : ' ').'"
aria-labelledby="heading_'.$id.'" data-parent="#'.$parent.'">
<div id="collapse_contant_'.$id.'" class="card-body ">';
});
</script>';
$this->addHtml($javascript);
$html = '
<div class="mt-4 rounded-lg">
<div class="px-4 bg-gray-100 border border-gray-50" id="card_'.$id.'">
<h5>
<a role="button"
class="block cursor-pointer"
data-toggle="collapse"
data-target="#collapse_'.$id.'"
aria-expanded="'.(($open) ? 'true' : 'false').'"
aria-controls="collapse_'.$id.'"
>
'.$title.'
</a>
</h5>
</div>
<div
id="collapse_'.$id.'"
class="px-4 border border-gray-50 bg-white collapse custom-collapse '.(($open) ? 'show' : '').'"
>
<div id="collapse_contant_'.$id.'" class="card-body ">';
$this->addHtml($html);
}

@ -191,8 +191,8 @@ class PlatformSettingsSchema extends AbstractSettingsSchema
ChoiceType::class,
[
'choices' => [
'Login' => '0',
'Course' => '1',
'Login' => 'login',
'Course' => 'course',
],
]
)

Loading…
Cancel
Save