Skip to content

Commit

Permalink
neue version
Browse files Browse the repository at this point in the history
  • Loading branch information
diddipoeler committed Mar 8, 2024
1 parent 77810bc commit bd7447e
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 50 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Extensions ?

Änderungen
---------------------
* 08-03-2024: **4.19.00** Teamname historisch
* 20-01-2024: **4.18.00** Anpassungen Joomla 4
* 02-05-2023: **4.17.00** Neue Felder für Einzelsportart Tischtennis
* 17-04-2023: **4.16.00** Neue Felder für Einzelsportart Tischtennis
Expand Down
5 changes: 4 additions & 1 deletion admin/libraries/sportsmanagement/model.php
Original file line number Diff line number Diff line change
Expand Up @@ -1288,10 +1288,13 @@ public function save($data)
}
else
{
$teamname = $data['teamvalue'][$value];
$teamname = $data['teamvalue'][$value];
$season_teamname = $data['season_teamname'][$value];
$object = new stdClass;
$object->id = $result;
$object->teamname = $teamname;
$object->season_teamname = $season_teamname;

$object->modified = $this->jsmdate->toSql();
$object->modified_by = $this->jsmuser->get('id');
$resultupdate = $this->jsmdb->updateObject('#__sportsmanagement_season_team_id', $object, 'id');
Expand Down
22 changes: 21 additions & 1 deletion admin/models/fields/seasoncheckbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ protected function getInput()
switch ( $targettable )
{
case 'season_team_id':
$query->select('season_id,teamname');
$query->select('season_id,teamname,season_teamname');
$query->from('#__sportsmanagement_' . $targettable);
break;
case 'season_person_id':
Expand Down Expand Up @@ -179,12 +179,32 @@ protected function getInput()
$html[] = '<td>';
$html[] = '<label for="' . $this->id . $i . '"' . $class . '>' . Text::_($option->text) . '</label>';
$html[] = '</td>';

switch ( $targettable )
{
case 'season_team_id':
$html[] = '<td>';
$html[] = '<input size="70" type="text" id="' . 'jform_teamvalue' . $i . '" name="' . 'jform[teamvalue]['.$option->value.']"' . ' value="'
. $this->teamvalue[$option->value]['teamname']. '"' . '/>';
$html[] = '</td>';
break;
case 'season_person_id':

break;
}
/**
$html[] = '<td>';
$html[] = '<input type="text" id="' . 'jform_teamvalue' . $i . '" name="' . 'jform[teamvalue]['.$option->value.']"' . ' value="'
. $this->teamvalue[$option->value]['teamname']. '"' . '/>';
$html[] = '</td>';
*/

/**
$html[] = '<td>';
$html[] = '<input type="text" id="' . 'jform_teamvalue2' . $i . '" name="' . 'jform[teamvalue2]['.$option->value.']"' . ' value="'
. $this->teamvalue2[$option->value]['season_teamname']. '"' . '/>';
$html[] = '</td>';
*/
switch ( $targettable )
{
case 'season_person_id':
Expand Down
37 changes: 1 addition & 36 deletions admin/models/forms/team.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,7 @@ filter="unset"
description="COM_SPORTSMANAGEMENT_ADMIN_TEAM_INFO_DESC"
class="inputbox"/>

<!--
addfieldpath="/administrator/components/com_sportsmanagement/elements"
-->

<!--
<field
name="sports_type_id"
type="sportstypes"
default="0"
size="1"
label="COM_SPORTSMANAGEMENT_GLOBAL_SPORT_TYPE"
description="COM_SPORTSMANAGEMENT_GLOBAL_SPORT_TYPE_DESC"
required="false">
<option
value="0">
COM_SPORTSMANAGEMENT_GLOBAL_SELECT_SPORT_TYPE</option>
</field>
-->


<field
name="sports_type_id"
type="sportstypelist"
Expand Down Expand Up @@ -148,23 +130,6 @@ filter="unset"
COM_SPORTSMANAGEMENT_GLOBAL_SELECT_AGEGROUP</option>
</field>

<!--
<field
addfieldpath="/administrator/components/com_sportsmanagement/elements"
name="agegroup_id"
type="agegroups"
default="0"
size="1"
label="COM_SPORTSMANAGEMENT_GLOBAL_AGEGROUP_TYPE"
description="COM_SPORTSMANAGEMENT_GLOBAL_AGEGROUP_TYPE_DESC"
required="false">
<option
value="0">
COM_SPORTSMANAGEMENT_GLOBAL_SELECT_AGEGROUP</option>
</field>
-->



<field
name="merge_clubs"
Expand Down
1 change: 1 addition & 0 deletions admin/sql/install.mysql.utf8.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,7 @@ CREATE TABLE IF NOT EXISTS `#__sportsmanagement_season_team_id` (
`cr_logo_big` varchar(255) DEFAULT NULL,
`kaderlink` VARCHAR( 250 ) NULL DEFAULT NULL,
`teamname` VARCHAR( 75 ) NULL DEFAULT NULL,
`season_teamname` VARCHAR( 200 ) NULL DEFAULT NULL,
PRIMARY KEY (`id`) ,
UNIQUE KEY `combi` (`team_id`,`season_id`) ,
KEY `team_id` (`team_id`),
Expand Down
2 changes: 1 addition & 1 deletion admin/sql/updates/mysql/4.19.00.sql
Original file line number Diff line number Diff line change
@@ -1 +1 @@

ALTER TABLE `#__sportsmanagement_season_team_id` ADD `season_teamname` VARCHAR( 200 ) NULL DEFAULT NULL;
2 changes: 1 addition & 1 deletion admin/views/fieldsets/tmpl/edit_4.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$templatesToLoad = array('footer','fieldsets');
sportsmanagementHelper::addTemplatePaths($templatesToLoad, $this);

// Include the component HTML helpers.
/** Include the component HTML helpers. */
HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');

// Jimport( 'joomla.html.html.tabs' );
Expand Down
2 changes: 1 addition & 1 deletion list.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<extensionset name="sportsmanagement" description="JSM">
<extension name="sportsmanagement" element="com_sportsmanagement" type="component" version="4.18.00" detailsurl="https://raw.githubusercontent.com/diddipoeler/sportsmanagement/master/sportsmanagement-update.xml"/>
<extension name="sportsmanagement" element="com_sportsmanagement" type="component" version="4.19.00" detailsurl="https://raw.githubusercontent.com/diddipoeler/sportsmanagement/master/sportsmanagement-update.xml"/>
</extensionset>
8 changes: 3 additions & 5 deletions script.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class com_sportsmanagementInstallerScript
* The release value would ideally be extracted from <version> in the manifest file,
* but at preflight, the manifest file exists only in the uploaded temp folder.
*/
private $release = '4.18.00';
private $release = '4.19.00';
private $old_release = '4.18.00';

// $language_update = '';
Expand Down Expand Up @@ -1144,13 +1144,11 @@ public function installPlugins( $adapter)
case 'jcemediabox';
if ($plugin_id)
{
// Plugin ist vorhanden
// wurde vielleicht schon aktualisiert
/** Plugin ist vorhanden wurde vielleicht schon aktualisiert */
}
else
{
// Plugin ist nicht vorhanden
// also installieren
/** Plugin ist nicht vorhanden also installieren */
$path = $src . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $name . '_3';
$installer = new Installer;
$result = $installer->install($path);
Expand Down
19 changes: 18 additions & 1 deletion sportsmanagement-update.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2401,7 +2401,24 @@
<targetplatform name="joomla" version=".*" />
</update>


<update>
<name>Sports-Management</name>
<description>Sports-Management Component</description>
<element>com_sportsmanagement</element>
<type>component</type>
<version>4.19.00</version>
<infourl title="Sports-Management URL">http://fussballineuropa.de</infourl>
<downloads>
<downloadurl type="full" format="zip">https://github.com/diddipoeler/sportsmanagement/archive/master.zip</downloadurl>
</downloads>
<tags>
<tag>some-tag</tag>
</tags>
<maintainer>Sports-Management Inc.</maintainer>
<maintainerurl>http://fussballineuropa.de</maintainerurl>
<section>some-section</section>
<targetplatform name="joomla" version=".*" />
</update>



Expand Down
2 changes: 1 addition & 1 deletion sportsmanagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<copyright>Copyright Info</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<!-- The version string is recorded in the components table -->
<version>4.18.00</version>
<version>4.19.00</version>
<!-- The description is optional and defaults to the name -->
<description>COM_SPORTSMANAGEMENT_DESCRIPTION</description>

Expand Down
4 changes: 2 additions & 2 deletions update-server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<description>Sports-Management Component</description>
<element>com_sportsmanagement</element>
<type>component</type>
<version>4.18.00</version>
<version>4.19.00</version>
<infourl title="Sports-Management URL">http://fussballineuropa.de</infourl>
<downloads>
<downloadurl type="full" format="zip">https://github.com/diddipoeler/sportsmanagement/archive/4.18.00.zip</downloadurl>
<downloadurl type="full" format="zip">https://github.com/diddipoeler/sportsmanagement/archive/4.19.00.zip</downloadurl>
</downloads>
<tags>
<tag>some-tag</tag>
Expand Down

0 comments on commit bd7447e

Please sign in to comment.