Skip to content

GitLab

Commit bf0fa303 authored by Stefan Bublies's avatar Stefan Bublies
Browse files

Merge branch '5-neue-kurs-api-und-erweiterung-der-extension' into 'master' 

Resolve "Neue Kurs-API und Erweiterung der Extension"

Closes #5

See merge request !5
parents fd266eb5 cd51841e
Hide whitespace changes
Inline Side-by-side
Classes/Controller/HiOrgServerSchnittstelleController.php
View file @ bf0fa303
......@@ -30,6 +30,11 @@ namespace DTInternet\DtiHiorg\Controller;
/**
* HiOrgServerSchnittstelleController
*/
use TYPO3\CMS\Core\Utility\DebugUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Page\PageRenderer;
class HiOrgServerSchnittstelleController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
/**
......@@ -40,6 +45,18 @@ class HiOrgServerSchnittstelleController extends \TYPO3\CMS\Extbase\Mvc\Controll
*/
protected $hiOrgServerSchnittstelleRepository = NULL;
/**
* Init
*
* @return void
*/
protected function initializeAction()
{
parent::initializeAction();
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
$pageRenderer->addCssFile('typo3conf/ext/dti_hiorg/Resources/Public/Stylesheets/drkcms_hiorg.css');
}
/**
* action list
*
......@@ -53,10 +70,19 @@ class HiOrgServerSchnittstelleController extends \TYPO3\CMS\Extbase\Mvc\Controll
$aparams01 = $this->settings['hiorg']['params01'];
$aparams02 = $this->settings['hiorg']['params02'];
$aparams03 = $this->settings['hiorg']['params03'];
$akurstyp = $this->settings['hiorg']['kurstyp'];
$akursConfigId = $this->settings['hiorg']['kursconfigid'];
$aintern = $this->settings['hiorg']['intern'];
$akuerzel = $this->settings['hiorg']['include'];
$url = "https://www.hiorg-server.de/".$adisplay.($akurstyp ? 'kurstyp='.$akurstyp : '').($aintern ? 'nurint='.$aintern : '')."&ov=$akuerzel&onlytable=1".($aparams01 ? '&monate='.$aparams01 : '').($aparams02? '&anz='.$aparams02 : '').($aparams03? '&gruppe='.$aparams03 : '');
$asandienstArt = $this->settings['hiorg']['sandienstart'];
if ($adisplay == 'kurse_extern.php?') {
$url = "https://www.hiorg-server.de/".$adisplay.'ov='.$akuerzel.'&'.($akursConfigId ? 'id='.$akursConfigId : '');
} elseif ($adisplay == 'sanform.php?') {
$url = "https://www.hiorg-server.de/".$adisplay.'ov='.$akuerzel.($asandienstArt ? '&art='.$asandienstArt : '').'&fromextern=1';
} else {
$url = "https://www.hiorg-server.de/".$adisplay.($aintern ? 'nurint='.$aintern : '')."&ov=$akuerzel&onlytable=1".($aparams01 ? '&monate='.$aparams01 : '').($aparams02? '&anz='.$aparams02 : '').($aparams03? '&gruppe='.$aparams03 : '');
}
if(function_exists("curl_init")) {
$ch = curl_init($url);
curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);
......
Configuration/FlexForms/flexform_dtihiorg.xml
View file @ bf0fa303
......@@ -30,7 +30,11 @@
</numIndex>
<numIndex index="1" type="array">
<numIndex index="0">Kursanzeige</numIndex>
<numIndex index="1">kurse.php?</numIndex>
<numIndex index="1">kurse_extern.php?</numIndex>
</numIndex>
<numIndex index="2" type="array">
<numIndex index="0">Sandienst-Anforderung</numIndex>
<numIndex index="1">sanform.php?</numIndex>
</numIndex>
</items>
</config>
......@@ -68,16 +72,26 @@
</config>
</TCEforms>
</settings.hiorg.params03>
<settings.hiorg.kurstyp>
<settings.hiorg.sandienstart>
<TCEforms>
<label>San-Dienst-Art</label>
<config>
<type>input</type>
<size>4</size>
<default></default>
</config>
</TCEforms>
</settings.hiorg.sandienstart>
<settings.hiorg.kursconfigid>
<TCEforms>
<label>Kurstyp</label>
<label>Konfigurations-ID der Kurse</label>
<config>
<type>input</type>
<size>8</size>
<default></default>
</config>
</TCEforms>
</settings.hiorg.kurstyp>
</settings.hiorg.kursconfigid>
<settings.hiorg.intern>
<TCEforms>
<label>Nur intern</label>
......@@ -90,4 +104,4 @@
</ROOT>
</sDEF>
</sheets>
</T3DataStructure>
\ No newline at end of file
</T3DataStructure>
Configuration/TypoScript/setup.txt
View file @ bf0fa303
......@@ -13,45 +13,3 @@ plugin.tx_dtihiorg {
# rewrittenPropertyMapper = 1
}
}
plugin.tx_dtihiorg._CSS_DEFAULT_STYLE (
.hiorg {
padding-top: 20px;
position: relative;
overflow: hidden;
}
table.midtable {
font-size: 1em;
}
.midtable img {
width: 0%;
}
.hiorg tr {
border-bottom: 1px solid #e0ddd6;
height: 2.25em;
}
.hiorg thead tr {
background: #EFEEEA;
}
.hiorg thead tr::after {
background-color: #EFEEEA;
content: " ";
display: table-cell;
}
.hiorg td,
.hiorg th {
padding: .25em .5em;
}
.karten_link_kurse img {
width: auto;
max-width: 100% !important;
}
)
Resources/Public/Stylesheets/drkcms_hiorg.css 0 → 100644
View file @ bf0fa303
.tx-dti-hiorg #externe-kursliste table {
border: none !important;
}
.tx-dti-hiorg #externe-kursliste table tr th, .tx-dti-hiorg #externe-kursliste table tr td {
border: none !important;
}
.hiorg {
padding-top: 20px;
position: relative;
overflow: hidden;
}
table.midtable {
font-size: 1em;
}
.midtable img {
width: 0%;
}
.hiorg tr {
border-bottom: 1px solid #e0ddd6;
height: 2.25em;
}
.hiorg thead tr {
background: #EFEEEA;
}
.hiorg thead tr::after {
background-color: #EFEEEA;
content: " ";
display: table-cell;
}
.hiorg td,
.hiorg th {
padding: .25em .5em;
}
.karten_link_kurse img {
width: auto;
max-width: 100% !important;
}
ext_emconf.php
View file @ bf0fa303
......@@ -21,7 +21,7 @@ $EM_CONF[$_EXTKEY] = array(
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '9.5.4',
'version' => '9.6.0',
'constraints' => array(
'depends' => array(
'typo3' => '9.5.0-9.5.99',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment