| ... | ... |
@@ -12,6 +12,7 @@ use Contao\DC_Table; |
| 12 | 12 |
use Contao\DataContainer; |
| 13 | 13 |
|
| 14 | 14 |
\Contao\System::loadLanguageFile('default');
|
| 15 |
+\Contao\System::loadLanguageFile('tl_vr_wa_slotassistant');
|
|
| 15 | 16 |
|
| 16 | 17 |
$GLOBALS['TL_DCA']['tl_vr_wa_slotassistant'] = |
| 17 | 18 |
[ |
| ... | ... |
@@ -44,23 +45,37 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slotassistant'] = |
| 44 | 45 |
'minCount' => 1, |
| 45 | 46 |
'columnFields' => |
| 46 | 47 |
[ |
| 47 |
- 'sorte' => |
|
| 48 |
+ 'date_start' => |
|
| 48 | 49 |
[ |
| 49 |
- 'label' => $GLOBALS['TL_LANG']['MSC']['wa_sorte'], |
|
| 50 |
- 'inputType' => 'select', |
|
| 51 |
- 'foreignKey' => 'tl_vr_wa_rebsorte.title', |
|
| 52 |
- 'eval' => ['style' => 'width:350px', 'mandatory' => true, 'chosen' =>true, 'includeBlankOption' => true] |
|
| 50 |
+ 'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_start'], |
|
| 51 |
+ 'inputType' => 'text', |
|
| 52 |
+ 'eval' => [ |
|
| 53 |
+ 'style' => 'width:350px', |
|
| 54 |
+ 'mandatory' => true, |
|
| 55 |
+ 'rgxp' =>'datim', |
|
| 56 |
+ 'datepicker' => true |
|
| 57 |
+ ] |
|
| 53 | 58 |
], |
| 54 |
- 'leseart' => |
|
| 59 |
+ 'date_end' => |
|
| 55 | 60 |
[ |
| 56 |
- 'label' => $GLOBALS['TL_LANG']['MSC']['wa_leseart'], |
|
| 57 |
- 'inputType' => 'select', |
|
| 58 |
- 'foreignKey' => 'tl_vr_wa_leseart.title', |
|
| 59 |
- 'eval' => ['style' => 'width:350px', 'mandatory' => true, 'chosen' =>true, 'includeBlankOption' => true] |
|
| 61 |
+ 'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_end'], |
|
| 62 |
+ 'inputType' => 'text', |
|
| 63 |
+ 'eval' => [ |
|
| 64 |
+ 'style' => 'width:350px', |
|
| 65 |
+ 'mandatory' => true, |
|
| 66 |
+ 'rgxp' =>'datim', |
|
| 67 |
+ 'datepicker' => true |
|
| 68 |
+ ] |
|
| 60 | 69 |
] |
| 61 | 70 |
] |
| 62 | 71 |
], |
| 63 | 72 |
'sql' => 'blob NULL' |
| 64 |
- ] |
|
| 73 |
+ ], |
|
| 74 |
+ 'enclosure' => [ |
|
| 75 |
+ 'exclude' => true, |
|
| 76 |
+ 'inputType' => 'fileTree', |
|
| 77 |
+ 'eval' => ['multiple' =>true, 'fieldType' =>'checkbox', 'filesOnly' =>true, 'isDownloads' =>true, 'extensions' =>Config::get('allowedDownload'), 'mandatory' =>true, 'isSortable' =>true],
|
|
| 78 |
+ 'sql' => "blob NULL" |
|
| 79 |
+ ], |
|
| 65 | 80 |
] |
| 66 | 81 |
]; |
| 67 | 82 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,27 @@ |
| 1 |
+<?xml version="1.0" ?> |
|
| 2 |
+<xliff version="1.1"> |
|
| 3 |
+ <file datatype="php" original="contao/languages/en/tl_vr_wa_slotassistant.xlf" source-language="en" target-language="de"> |
|
| 4 |
+ <body> |
|
| 5 |
+ <trans-unit id="tl_vr_wa_slotassistant.date_start"> |
|
| 6 |
+ <source>Timeframe beginn</source> |
|
| 7 |
+ <target>Zeitraum Beginn</target> |
|
| 8 |
+ </trans-unit> |
|
| 9 |
+ <trans-unit id="tl_vr_wa_slotassistant.date_end"> |
|
| 10 |
+ <source>Timeframe end</source> |
|
| 11 |
+ <target>Zeitraum Ende</target> |
|
| 12 |
+ </trans-unit> |
|
| 13 |
+ <trans-unit id="tl_vr_wa_slotassistant.base_legend"> |
|
| 14 |
+ <source>Base settings</source> |
|
| 15 |
+ <target>Grundeinstellungen</target> |
|
| 16 |
+ </trans-unit> |
|
| 17 |
+ <trans-unit id="tl_vr_wa_slotassistant.time_legend"> |
|
| 18 |
+ <source>Timeframe</source> |
|
| 19 |
+ <target>Zeitraum</target> |
|
| 20 |
+ </trans-unit> |
|
| 21 |
+ <trans-unit id="tl_vr_wa_slotassistant.slot_legend"> |
|
| 22 |
+ <source>Slot settings</source> |
|
| 23 |
+ <target>Slot-Einstellungen</target> |
|
| 24 |
+ </trans-unit> |
|
| 25 |
+ </body> |
|
| 26 |
+ </file> |
|
| 27 |
+</xliff> |
| 0 | 28 |
deleted file mode 100644 |
| ... | ... |
@@ -1,19 +0,0 @@ |
| 1 |
-<?xml version="1.0" ?> |
|
| 2 |
-<xliff version="1.1"> |
|
| 3 |
- <file datatype="php" source-language="en" target-language="de"> |
|
| 4 |
- <body> |
|
| 5 |
- <trans-unit id="wa_slotassistant.base_legend"> |
|
| 6 |
- <source>Base settings</source> |
|
| 7 |
- <target>Grundeinstellungen</target> |
|
| 8 |
- </trans-unit> |
|
| 9 |
- <trans-unit id="wa_slotassistant.time_legend"> |
|
| 10 |
- <source>Timeframe</source> |
|
| 11 |
- <target>Zeitraum</target> |
|
| 12 |
- </trans-unit> |
|
| 13 |
- <trans-unit id="wa_slotassistant.slot_legend"> |
|
| 14 |
- <source>Slot settings</source> |
|
| 15 |
- <target>Slot-Einstellungen</target> |
|
| 16 |
- </trans-unit> |
|
| 17 |
- </body> |
|
| 18 |
- </file> |
|
| 19 |
-</xliff> |
| 20 | 0 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,22 @@ |
| 1 |
+<?xml version="1.0" ?> |
|
| 2 |
+<xliff version="1.1"> |
|
| 3 |
+ <file datatype="php" original="contao/languages/en/tl_vr_wa_slotassistant.xlf" source-language="en"> |
|
| 4 |
+ <body> |
|
| 5 |
+ <trans-unit id="tl_vr_wa_slotassistant.date_start"> |
|
| 6 |
+ <source>Timeframe beginn</source> |
|
| 7 |
+ </trans-unit> |
|
| 8 |
+ <trans-unit id="tl_vr_wa_slotassistant.date_end"> |
|
| 9 |
+ <source>Timeframe end</source> |
|
| 10 |
+ </trans-unit> |
|
| 11 |
+ <trans-unit id="tl_vr_wa_slotassistant.base_legend"> |
|
| 12 |
+ <source>Base settings</source> |
|
| 13 |
+ </trans-unit> |
|
| 14 |
+ <trans-unit id="tl_vr_wa_slotassistant.time_legend"> |
|
| 15 |
+ <source>Timeframe</source> |
|
| 16 |
+ </trans-unit> |
|
| 17 |
+ <trans-unit id="tl_vr_wa_slotassistant.slot_legend"> |
|
| 18 |
+ <source>Slot settings</source> |
|
| 19 |
+ </trans-unit> |
|
| 20 |
+ </body> |
|
| 21 |
+ </file> |
|
| 22 |
+</xliff> |
| ... | ... |
@@ -17,7 +17,7 @@ |
| 17 | 17 |
|
| 18 | 18 |
{% for legend, widgets in fields %}
|
| 19 | 19 |
<fieldset id="pal_{{ legend }}" class="tl_tbox">
|
| 20 |
- <legend onclick="AjaxRequest.toggleFieldset(this,{{ legend }},'wa_slotassistant')">{{ ('wa_slotassistant.'~legend)|trans([], 'contao_default') }}</legend>
|
|
| 20 |
+ <legend onclick="AjaxRequest.toggleFieldset(this,{{ legend }},'tl_vr_wa_slotassistant')">{{ ('tl_vr_wa_slotassistant.'~legend)|trans([], 'contao_default') }}</legend>
|
|
| 21 | 21 |
{% for field in widgets %}
|
| 22 | 22 |
<div class="{{ field.class is defined and field.class|length ? field.class ~ ' ' : '' }}widget">
|
| 23 | 23 |
{{ field.widget.parse()|raw }}{{ field.widget.wizard is defined ? field.widget.wizard : '' }}
|
| ... | ... |
@@ -90,7 +90,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController |
| 90 | 90 |
'ref' => $this->request->attributes->get('_contao_referer_id')
|
| 91 | 91 |
]; |
| 92 | 92 |
System::loadLanguageFile('default');
|
| 93 |
- System::loadLanguageFile('wa_slotassistant');
|
|
| 93 |
+ System::loadLanguageFile('tl_vr_wa_slotassistant');
|
|
| 94 | 94 |
Controller::loadDataContainer('tl_vr_wa_slot');
|
| 95 | 95 |
Controller::loadDataContainer('tl_vr_wa_slotassistant');
|
| 96 | 96 |
|
| ... | ... |
@@ -147,7 +147,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController |
| 147 | 147 |
] |
| 148 | 148 |
], |
| 149 | 149 |
'time_legend' => [ |
| 150 |
- [ |
|
| 150 |
+ /*[ |
|
| 151 | 151 |
'class' => 'w50 wizard', |
| 152 | 152 |
'help' => 'Der Zeitpunkt ab wann der erste Zeitslot angelegt werden soll.', |
| 153 | 153 |
'widget' => new TextField([ |
| ... | ... |
@@ -168,7 +168,7 @@ class WeinanlieferungSlotAssistantController extends AbstractController |
| 168 | 168 |
'rgxp' => 'datim', |
| 169 | 169 |
'datepicker' => true, |
| 170 | 170 |
]) |
| 171 |
- ], |
|
| 171 |
+ ],*/ |
|
| 172 | 172 |
[ |
| 173 | 173 |
'class' => 'clr', |
| 174 | 174 |
'help' => 'blah', |
| ... | ... |
@@ -177,19 +177,27 @@ class WeinanlieferungSlotAssistantController extends AbstractController |
| 177 | 177 |
'minCount' => 1, |
| 178 | 178 |
'columnFields' => |
| 179 | 179 |
[ |
| 180 |
- 'sorte' => |
|
| 180 |
+ 'date_start' => |
|
| 181 | 181 |
[ |
| 182 |
- 'label' => $GLOBALS['TL_LANG']['MSC']['wa_sorte'], |
|
| 183 |
- 'inputType' => 'select', |
|
| 184 |
- 'foreignKey' => 'tl_vr_wa_rebsorte.title', |
|
| 185 |
- 'eval' => ['style' => 'width:350px', 'mandatory' => true, 'chosen' =>true, 'includeBlankOption' => true] |
|
| 182 |
+ 'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_start'], |
|
| 183 |
+ 'inputType' => 'text', |
|
| 184 |
+ 'eval' => [ |
|
| 185 |
+ 'style' => 'width:350px', |
|
| 186 |
+ 'mandatory' => true, |
|
| 187 |
+ 'rgxp' =>'datim', |
|
| 188 |
+ 'datepicker' => true |
|
| 189 |
+ ] |
|
| 186 | 190 |
], |
| 187 |
- 'leseart' => |
|
| 191 |
+ 'date_end' => |
|
| 188 | 192 |
[ |
| 189 |
- 'label' => $GLOBALS['TL_LANG']['MSC']['wa_leseart'], |
|
| 190 |
- 'inputType' => 'select', |
|
| 191 |
- 'foreignKey' => 'tl_vr_wa_leseart.title', |
|
| 192 |
- 'eval' => ['style' => 'width:350px', 'mandatory' => true, 'chosen' =>true, 'includeBlankOption' => true] |
|
| 193 |
+ 'label' => $GLOBALS['TL_LANG']['tl_vr_wa_slotassistant']['date_end'], |
|
| 194 |
+ 'inputType' => 'text', |
|
| 195 |
+ 'eval' => [ |
|
| 196 |
+ 'style' => 'width:350px', |
|
| 197 |
+ 'mandatory' => true, |
|
| 198 |
+ 'rgxp' =>'datim', |
|
| 199 |
+ 'datepicker' => true |
|
| 200 |
+ ] |
|
| 193 | 201 |
] |
| 194 | 202 |
] |
| 195 | 203 |
]) |
| ... | ... |
@@ -251,6 +259,10 @@ class WeinanlieferungSlotAssistantController extends AbstractController |
| 251 | 259 |
{
|
| 252 | 260 |
$field['widget']->id = $field['widget']->name; |
| 253 | 261 |
} |
| 262 |
+ if (empty($field['widget']->table)) |
|
| 263 |
+ {
|
|
| 264 |
+ $field['widget']->strTable = 'tl_vr_wa_slotassistant'; |
|
| 265 |
+ } |
|
| 254 | 266 |
|
| 255 | 267 |
$wizard = ''; |
| 256 | 268 |
|