Changeset 752

Timestamp:

12/27/08 18:35:29 (4 years ago)

Author:

MDMAN

Message:

bugfix racing.league-PlugIn?

Location:

de.mdman.racing.league

Files:

• de.xml (modified) (4 diffs)
• files/lib/form/RacingLeaguePunishForm.class.php (modified) (13 diffs)
• templates/racingLeaguePunish.tpl (modified) (3 diffs)
• templates/racingLeagueResults.tpl (modified) (2 diffs)

de.mdman.racing.league/de.xml

@@ -19 +19 @@
                 <item name="wcf.racing.league.button.editSaisons.newSaison"><![CDATA[Neue Saison anlegen]]></item>
                 <item name="wcf.racing.league.button.editSaisons.newTeam"><![CDATA[Neues Team anlegen]]></item>
-                <item name="wcf.racing.league.button.editSaisons.newPunish"><![CDATA[Neue Strafen verhÀngen]]></item>
-                <item name="wcf.racing.league.button.editSaisons.punish"><![CDATA[Neue Strafe aussprechen]]></item>
+                <item name="wcf.racing.league.button.editSaisons.newPunish"><![CDATA[Neue Strafe verhÀngen]]></item>
+                <item name="wcf.racing.league.button.editSaisons.punish"><![CDATA[Strafen]]></item>
                 <item name="wcf.racing.league.button.editSaisons.UserToTeam"><![CDATA[Teamzuweisung]]></item>
                 <item name="wcf.racing.league.button.editTeams"><![CDATA[Teams]]></item>
@@ -50 +50 @@
                 <item name="wcf.racing.league.newRace"><![CDATA[<strong>Name des neuen Rennens</strong>]]></item>
                 <item name="wcf.racing.league.newRaceNo"><![CDATA[<strong>Rennnummer</strong>]]></item>
+                <item name="wcf.racing.league.newResult"><![CDATA[<strong>Platz und Fahrer</strong>]]></item>
+                <item name="wcf.racing.league.newResultPlace"><![CDATA[<strong>{$place}. Platz</strong>]]></item>
                 <item name="wcf.racing.league.newSaison"><![CDATA[<strong>Name der neuen Saison</strong>]]></item>
                 <item name="wcf.racing.league.newSuccess"><![CDATA[Das Anlegen / Speichern war erfolgreich.]]></item>
-                <item name="wcf.racing.league.newTeam"><![CDATA[<strong>Name des neuen Teams</strong>]]></item>          
-
+                <item name="wcf.racing.league.newTeam"><![CDATA[<strong>Name des neuen Teams</strong>]]></item>
+                                
                 <item name="wcf.racing.league.noActiveRaces"><![CDATA[Es sind keine Rennen in der Saison aktiv. Alle Rennen fÃŒr die Saison wurden gefahren, oder es wurde noch kein Renntag angelegt.{if $this->user->getPermission('admin.racing.league.caneditraces')}<br /><br />Wenn Sie einen Renntag fÃŒr die aktive Saison hinzufÃŒgen wollen, <a href="index.php?form=RacingLeagueRaces{@SID_ARG_2ND}&amp;newRaces=1">drÃŒcken Sie hier...</a>{/if}]]></item>
                 
@@ -126 +128 @@
                  
                 <item name="wcf.racing.league.results.action"><![CDATA[<strong>Funktion</strong>]]></item>
+                <item name="wcf.racing.league.results.editResult"><![CDATA[Renn-Ergebnis bearbeiten fÃŒr  {$raceName}]]></item>
+                <item name="wcf.racing.league.results.editResult.description"><![CDATA[WÀhlen Sie hier die Fahrer aus dem Dropdown-MenÌ entsprechend deren erfahrenen PlÀtze.<br />Die PlÀtze sehen Sie vor dem Dropdown-MenÌ.<br />Sollte ein Platz nicht belegt sein, sollten Sie die "----------" auswÀhlen.<br /><br />Stellen Sie nun das Ergebnis fÌr das Rennen  <strong>{$raceName}</strong>  ein.]]></item>
                 <item name="wcf.racing.league.results.newResult"><![CDATA[Neues Renn-Ergebnis speichern fÃŒr  {$raceName}]]></item>
                 <item name="wcf.racing.league.results.newResult.description"><![CDATA[WÀhlen Sie hier die Fahrer aus dem Dropdown-MenÌ entsprechend deren erfahrenen PlÀtze.<br />Die PlÀtze sehen Sie vor dem Dropdown-MenÌ.<br />Sollte ein Platz nicht belegt sein, sollten Sie die "----------" auswÀhlen.<br /><br />Stellen Sie nun das Ergebnis fÌr das Rennen  <strong>{$raceName}</strong>  ein.]]></item>
@@ -137 +141 @@
                 <item name="wcf.racing.league.results.racename"><![CDATA[<strong>Renn-Name / Renn-Ort</strong>]]></item>
                 <item name="wcf.racing.league.results.raceNo"><![CDATA[<strong>Renn-Nummer</strong>]]></item>
-                                                 
+                
                 <item name="wcf.racing.league.saison.activ"><![CDATA[Saison aktivieren]]></item>
                 <item name="wcf.racing.league.saison.activaded"><![CDATA[Saison aktiviert]]></item>                             

de.mdman.racing.league/files/lib/form/RacingLeaguePunishForm.class.php

@@ -25 +25 @@
         public $punishReason = '';                      
         public $drivedRaces = array();
+        public $raceName = '';
+        public $editRaceName = '';
         
         public $redirect = 'RacingLeaguePunish';
@@ -37 +39 @@
                 if (isset($_REQUEST["editPunishID"]))   $this->editPunishID = intval($_REQUEST["editPunishID"]);
                 if (isset($_REQUEST["addPunish"]))              $this->addPunish = intval($_REQUEST["addPunish"]);
-                if (isset($_REQUEST["raceID"]))         $this->raceID = intval($_REQUEST["raceID"]);                                    
+                if (isset($_REQUEST["raceID"]))                 $this->raceID = intval($_REQUEST["raceID"]);                                    
         }
         
@@ -46 +48 @@
                 parent::readFormParameters();
                 
-                if (isset($_POST["raceID"]))    $this->raceID = intval($_POST["raceID"]);
-                if (isset($_POST["driver"]))    $this->driver = intval($_POST["driver"]);
+                if (isset($_POST["raceID"]))            $this->raceID = intval($_POST["raceID"]);
+                if (isset($_POST["driver"]))            $this->driver = intval($_POST["driver"]);
                 if (isset($_POST["minusPoints"]))       $this->minusPoints = intval($_POST["minusPoints"]);
                 if (isset($_POST["punishReason"]))      $this->punishReason = StringUtil::trim($_POST["punishReason"]);
@@ -119 +121 @@
                         }
                 }
+
+                if ($this->activeSaisonID != 0 && $this->addPunish > 1 && $this->raceID > 0) {
+                        //Hier wird der Name des Rennens geladen.
+                        $sql = "SELECT raceName
+                                        FROM `wcf".WCF_N."_racing_races`
+                                        WHERE `saisonID` = '".$this->activeSaisonID."'
+                                        AND `raceID` = '".$this->raceID."'
+                                        ";              
+                        
+                        $this->raceName = WCF::getDB()->getFirstRow($sql);                                              
+                }
                 
                 if ($this->activeSaisonID != 0 && $this->editPunishID > 0) {
@@ -149 +162 @@
                                 $this->punishReason = $row["punishReason"];
                                 $this->raceID = $row["raceID"];
+                                $this->editRaceName = $row["raceName"];
                         }                       
                 }
@@ -190 +204 @@
                         $punishID = 0;                  
                         $punishID = mysql_insert_id();
-
                         
                         $row = 0;
@@ -197 +210 @@
                         // Hier wird die Strafe in die DB gespeichert fuer das Team
                         if ($teamID > 0) {
-                        $sql = "INSERT INTO `wcf".WCF_N."_racing_punish_to_team`
-                                (`saisonID`, `punishID`, `raceID`, `userID`, teamID, `minusPoints`, `punishReason`)
-                                VALUES ('".escapeString($this->activeSaisonID)."', '".escapeString($punishID)."', '".escapeString($this->raceID)."', '".escapeString($this->driver)."', '".escapeString($teamID)."', '".escapeString($this->minusPoints)."', '".escapeString($this->punishReason)."')
-                                        ";
-
-                        $res = WCF::getDB()->sendQuery($sql);
+                                $sql = "INSERT INTO `wcf".WCF_N."_racing_punish_to_team`
+                                                (`saisonID`, `punishID`, `raceID`, `userID`, teamID, `minusPoints`, `punishReason`)
+                                        VALUES ('".escapeString($this->activeSaisonID)."', '".escapeString($punishID)."', '".escapeString($this->raceID)."', '".escapeString($this->driver)."', '".escapeString($teamID)."', '".escapeString($this->minusPoints)."', '".escapeString($this->punishReason)."')
+                                                ";
+
+                                $res = WCF::getDB()->sendQuery($sql);
                         }
         
@@ -208 +221 @@
                         $this->minusPoints = '';
                         $this->punishReason = '';
-                        $this->raceID = 0;
 
                         if ($row > 0) {                         
@@ -219 +231 @@
 
                 // Hier wird eine Strafe bearbeitet, editiert
-                if ($this->editPunishID > 0 && isset($this->driver) && isset($this->minusPoints) && isset($this->punishReason) && $this->raceID > 0 && $this->activeSaisonID != 0) {
-
-                        // Hier wird vom jeweiligen Fahrer (=userID) das dazugehörige Team ermittelt
+                if ($this->editPunishID > 0 && isset($this->driver) && isset($this->minusPoints) && isset($this->punishReason) && $this->editPunishID > 0 && $this->activeSaisonID != 0) {
+
+                        // Hier wird vom jeweiligen Fahrer (=userID) das dazugehoerige Team ermittelt
                         $sql = "SELECT `teamID`
                                         FROM `wcf".WCF_N."_racing_user_to_team`
@@ -239 +251 @@
                         // Hier wird die Strafe nun Bearbeitet und gespeichert.
                         $sql = "UPDATE `wcf".WCF_N."_racing_punish`
-                                        SET `raceID` = '".escapeString($this->raceID)."',
-                                                `userID` = '".escapeString($this->driver)."',
+                                        SET `userID` = '".escapeString($this->driver)."',
                                                 `minusPoints` = '".escapeString($this->minusPoints)."',
                                                 `punishReason` = '".escapeString($this->punishReason)."'
@@ -252 +263 @@
                         $row = WCF::getDB()->getAffectedRows($res);
                         
-                        // Hier wird auch die Starfe fÌr die Team-Tabelle bearbeitet
-                        $sql = "UPDATE `wcf".WCF_N."_racing_punish_to_team`
-                                        SET `raceID` = '".escapeString($this->raceID)."',
-                                                `userID` = '".escapeString($this->driver)."',
-                                                `teamID` = '".escapeString($teamID)."',
-                                                `minusPoints` = '".escapeString($this->minusPoints)."',
-                                                `punishReason` = '".escapeString($this->punishReason)."'
+                        // Hier wird auch die Starfe fuer die Team-Tabelle bearbeitet
+                        // Erst wird die alte Strafe gelöscht.
+                        
+                        $sql = "DELETE FROM `wcf".WCF_N."_racing_punish_to_team`
                                         WHERE `punishID` = '".escapeString($this->editPunishID)."'
                                         AND `saisonID` = '".escapeString($this->activeSaisonID)."'
@@ -264 +272 @@
                         
                         WCF::getDB()->sendQuery($sql);
-
+                        
+                        // Hier wird die neue Strafe fÃŒr das Team gespeichert.
+                        
+                        if ($teamID > 0) {
+                                $sql = "INSERT INTO `wcf".WCF_N."_racing_punish_to_team`
+                                                (`saisonID`, `punishID`, `raceID`, `userID`, teamID, `minusPoints`, `punishReason`)
+                                        VALUES ('".escapeString($this->activeSaisonID)."', '".escapeString($this->editPunishID)."', '".escapeString($this->raceID)."', '".escapeString($this->driver)."', '".escapeString($teamID)."', '".escapeString($this->minusPoints)."', '".escapeString($this->punishReason)."')
+                                                ";
+
+                                $res = WCF::getDB()->sendQuery($sql);
+                        }
+                        
                         $this->editPunishID = 0;
                         $this->minusPoints = '';
                         $this->punishReason = '';
-                        $this->raceID = 0;
 
                         if ($row > 0) {                         
@@ -295 +313 @@
                         'minusPoints' => $this->minusPoints,
                         'punishReason' => $this->punishReason,
+                        'raceName' => $this->raceName,
+                        'editRaceName' => $this->editRaceName,
                                                                                                 
                         'redirect' => $this->redirect

de.mdman.racing.league/templates/racingLeaguePunish.tpl

@@ -83 +83 @@
                         <p class="description">{lang}wcf.racing.league.punish.addPunish2.description{/lang}</p>                                         
                 <br />
+                        <div class="formElement">
+                                <div class="formFieldLabel">
+                                        <label for="racename">{lang}wcf.racing.league.punish.addPunish.racename{/lang}</label>
+                                </div>
+                                
+                                <div class="formField">
+                                        <label for="racename">{$raceName.raceName}</label>
+                                </div>
+                        </div>
+
                         <div class="formElement{if $errorField == 'driver'} formError{/if}">
                                 <div class="formFieldLabel">
@@ -149 +159 @@
                 <h3 class="subHeadline"><img src="{@RELATIVE_WCF_DIR}icon/saisonwEditS.png" alt="" /> {lang}wcf.racing.league.punish.editPunish{/lang}</h3>
                         <p class="description">{lang}wcf.racing.league.punish.editPunish.description{/lang}</p>                                         
-                        {$editRaceName}
+                        
                 <br />
+                        <div class="formElement">
+                                <div class="formFieldLabel">
+                                        <label for="racename">{lang}wcf.racing.league.punish.addPunish.racename{/lang}</label>
+                                </div>
+                                
+                                <div class="formField">
+                                        <label for="racename">{$editRaceName}</label>
+                                </div>
+                        </div>
+                        
                         <div class="formElement{if $errorField == 'driver'} formError{/if}">
                                 <div class="formFieldLabel">
@@ -265 +285 @@
                                                         <td></td>
                                                         <td></td>
-                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1"><span>{lang}wcf.racing.league.button.editSaisons.addPunish{/lang}</span></a></td>
-                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1" title="{lang}wcf.racing.league.button.editSaisons.addPunish{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /></a></td>
+                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1"><span>{lang}wcf.racing.league.button.editSaisons.newPunish{/lang}</span></a></td>
+                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1" title="{lang}wcf.racing.league.button.editSaisons.newPunish{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /></a></td>
                                                         </tr>
                                                 </tbody>

de.mdman.racing.league/templates/racingLeagueResults.tpl

@@ -198 +198 @@
         {/if}
 
-        {if $noActiveRaces|isset}{@$noActiveRaces}{/if}
-        
         {if $saisons|count && $groupID != 0 && $race}
+        
         <div class="largeButtons">
                 <ul>
                         {if $this->user->getPermission('admin.racing.league.caneditresults')}<li><a href="index.php?form=RacingLeagueResults{@SID_ARG_2ND}&amp;newResults=1"><img src="{@RELATIVE_WCF_DIR}icon/saisonM.png" alt="" /> <span>{lang}wcf.racing.league.button.editSaisons.newResult{/lang}</span></a></li>{/if}
-                        {if $this->user->getPermission('admin.racing.league.caneditresults') && $drivedRaces|count > 0}<li><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddM.png" alt="" /> <span>{lang}wcf.racing.league.button.editSaisons.newPunish{/lang}</span></a></li>{/if}
+                        {if $this->user->getPermission('admin.racing.league.caneditresults') && $drivedRaces|count > 0}<li><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddM.png" alt="" /> <span>{lang}wcf.racing.league.button.editSaisons.punish{/lang}</span></a></li>{/if}
                 </ul>
         </div>  
@@ -210 +209 @@
         <br />
         <br />
-        {/if}
-        
+        
+        {elseif $saisons|count && $groupID != 0 && $drivedRaces|count > 0}
+        
+        <div class="largeButtons">
+                <ul>                    
+                        {if $this->user->getPermission('admin.racing.league.caneditresults')}<li><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddM.png" alt="" /> <span>{lang}wcf.racing.league.button.editSaisons.punish{/lang}</span></a></li>{/if}
+                </ul>
+        </div>  
+        <br />
+        <br />
+        <br />
+        
+        {/if}
+
+        {if $noActiveRaces|isset}{@$noActiveRaces}{/if} 
+
         {if $saisonID == 0 && $saisons|count > 1}
         <form method="post" action="index.php?form=RacingLeagueResults{@SID_ARG_2ND}">