4 Commits

Author SHA1 Message Date
03f31f3e8b adjust documentation 2023-03-30 13:33:39 +02:00
3d83650f7c fix JS for multiforms 2023-03-30 13:30:04 +02:00
cf6dd76aa9 adjust documentation 2023-03-22 16:00:53 +01:00
0213f2e6b3 fix cascaded HTML elements to prevent form issues 2023-03-22 15:58:02 +01:00
3 changed files with 59 additions and 47 deletions

View File

@ -41,43 +41,45 @@
}, 3000); }, 3000);
document.getElementById('mask').className='on'; document.getElementById('mask').className='on';
document.getElementById('popup2').className='d3loader-2 on'; document.getElementById('popup2').className='d3loader-2 on';
document.getElementById('taskid').value = id; form = document.getElementById('form_' + id);
document.getElementById('format').value = format; form.format.value = format;
document.getElementById('myedit').submit(); form.submit();
} }
[{/strip}][{/capture}] [{/strip}][{/capture}]
[{oxscript add=$smarty.capture.d3script}] [{oxscript add=$smarty.capture.d3script}]
<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" style="padding: 0;margin: 0;height:0;"> [{assign var="groups" value=$oView->getGroups()}]
[{$oViewConf->getHiddenSid()}] [{if $groups|@count}]
<input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]"> <div id="accordion">
<input type="hidden" name="fnc" value="runTask"> [{foreach from=$oView->getGroups() item="group"}]
<input type="hidden" name="taskid" id="taskid" value=""> <div class="card mb-2">
<input type="hidden" name="format" id="format" value="CSV"> <div class="card-header p-1" id="heading[{$group}]">
<h4 class="mb-0">
<span class="btn p-1" data-toggle="collapse" data-target="#collapse[{$group}]" aria-expanded="false" aria-controls="collapse[{$group}]">
[{oxmultilang ident=$group}]
</span>
</h4>
</div>
<div id="collapse[{$group}]" class="collapse" aria-labelledby="heading[{$group}]" data-parent="#accordion">
<div class="card-body pb-0">
<div class="row">
[{foreach from=$oView->getGroupTasks($group) key="id" item="item"}]
<div class="col-sm-6 col-md-4 col-lg-3 pb-4">
<div class="card">
<h5 class="card-header">
[{$item->getTitle()}]
</h5>
<div class="card-body">
<form name="myedit" id="form_[{$id}]" action="[{$oViewConf->getSelfLink()}]" method="post">
[{$oViewConf->getHiddenSid()}]
<input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
<input type="hidden" name="fnc" value="runTask">
<input type="hidden" name="taskid" value="[{$id}]">
<input type="hidden" name="format" value="CSV">
[{assign var="groups" value=$oView->getGroups()}]
[{if $groups|@count}]
<div id="accordion">
[{foreach from=$oView->getGroups() item="group"}]
<div class="card mb-2">
<div class="card-header p-1" id="heading[{$group}]">
<h4 class="mb-0">
<span class="btn p-1" data-toggle="collapse" data-target="#collapse[{$group}]" aria-expanded="false" aria-controls="collapse[{$group}]">
[{oxmultilang ident=$group}]
</span>
</h4>
</div>
<div id="collapse[{$group}]" class="collapse" aria-labelledby="heading[{$group}]" data-parent="#accordion">
<div class="card-body pb-0">
<div class="row">
[{foreach from=$oView->getGroupTasks($group) key="id" item="item"}]
<div class="col-sm-6 col-md-4 col-lg-3 pb-4">
<div class="card">
<h5 class="card-header">
[{$item->getTitle()}]
</h5>
<div class="card-body">
[{if $item->getDescription()}] [{if $item->getDescription()}]
[{assign var="description" value=$item->getDescription()}] [{assign var="description" value=$item->getDescription()}]
[{assign var="sectionlength" value="100"}] [{assign var="sectionlength" value="100"}]
@ -89,7 +91,7 @@
<p class="card-text" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="cursor: pointer"> <p class="card-text" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="cursor: pointer">
[{$shorttext}]... [{$shorttext}]...
</p> </p>
<p class="card-text collapse" id="collapseExample"> <p class="card-text collapse" id="collapseExample_[{$id}]">
...[{$description|replace:$shorttext:''}] ...[{$description|replace:$shorttext:''}]
</p> </p>
[{/if}] [{/if}]
@ -104,25 +106,27 @@
[{block name="exportSubmit"}] [{block name="exportSubmit"}]
[{include file=$submit}] [{include file=$submit}]
[{/block}] [{/block}]
</div>
</form>
</div> </div>
</div> </div>
[{/foreach}] </div>
</div> [{/foreach}]
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div> </div>
</div> </div>
</div>
[{/foreach}] [{/foreach}]
</div> </div>
[{else}] [{else}]
<div class="alert alert-primary" role="alert"> <div class="alert alert-primary" role="alert">
[{oxmultilang ident=$d3dw_noitemmessageid}] [{oxmultilang ident=$d3dw_noitemmessageid}]
</div> </div>
[{/if}] [{/if}]
</form>
<div id="mask" class=""></div> <div id="mask" class=""></div>
<div id="popup2" class="d3loader-2"> <div id="popup2" class="d3loader-2">

View File

@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...rel_2.x) ## [Unreleased](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.1...rel_2.x)
## [2.1.1.1](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.1...2.1.1.2) - 2023-03-30
### Fixed
- fix JavaScript for multiple forms
## [2.1.1.1](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...2.1.1.1) - 2023-03-22
### Fixed
- wrong cascaded HTML elements
## [2.1.1.0](https://git.d3data.de/D3Public/DataWizard/compare/2.1.0.0...2.1.1.0) - 2022-12-24 ## [2.1.1.0](https://git.d3data.de/D3Public/DataWizard/compare/2.1.0.0...2.1.1.0) - 2022-12-24
### Added ### Added

View File

@ -32,7 +32,7 @@ $aModule = [
'en' => '', 'en' => '',
], ],
'thumbnail' => '', 'thumbnail' => '',
'version' => '2.1.1.0', 'version' => '2.1.1.2',
'author' => 'D&sup3; Data Development (Inh.: Thomas Dartsch)', 'author' => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
'email' => 'support@shopmodule.com', 'email' => 'support@shopmodule.com',
'url' => 'https://www.oxidmodule.com/', 'url' => 'https://www.oxidmodule.com/',