Changeset 707

Timestamp:

11/10/08 17:29:57 (5 years ago)

Author:

MDMAN

Message:

racing-league modified

Location:

racing.league

Files:

• de.xml (modified) (1 diff)
• files/lib/action/RacingLeagueDeletePunishAction.class.php (added)
• files/lib/action/RacingLeagueDeleteRaceAction.class.php (modified) (1 diff)
• files/lib/action/RacingLeagueDeleteResultAction.class.php (modified) (1 diff)
• files/lib/action/RacingLeagueDeleteSaisonAction.class.php (modified) (1 diff)
• files/lib/form/RacingLeaguePunishForm.class.php (modified) (4 diffs)
• package.xml (modified) (1 diff)
• templates/racingLeaguePunish.tpl (modified) (7 diffs)

racing.league/de.xml

@@ -4 +4 @@
         <category name="wcf.racing.league">
                 <!-- COPYRIGHT -->
-                <item name="wcf.racing.league.copyright"><![CDATA[<a href="http://www.mdman.de"><strong>Racing-League PlugIn&copy; 1.0.0 beta 2</strong>, entwickelt von MDMAN</a> <strong>| Icons by illyaine</strong>]]></item>
+                <item name="wcf.racing.league.copyright"><![CDATA[<a href="http://www.mdman.de"><strong>Racing-League PlugIn&copy; 1.0.0 beta 3</strong>, entwickelt von MDMAN</a> <strong>| Icons by illyaine</strong>]]></item>
                 <!-- COPYRIGHT -->
                 

racing.league/files/lib/action/RacingLeagueDeleteRaceAction.class.php

@@ -39 +39 @@
                         WCF::getDB()->sendQuery($sql);
                         
+                        // hier werden auch Strafen fÌr das gelöschte Rennen gelöscht                        
+                        $sql = "DELETE FROM `wcf".WCF_N."_racing_punish`
+                                WHERE `raceID` = '".escapeString($this->raceID)."'
+                                        ";                      
+                        WCF::getDB()->sendQuery($sql);
+                        
                         if ($row > 0) {                         
                                 WCF::getTPL()->append('userMessages', WCF::getTPL()->fetch('racingLeagueDeleteSuccess'));

racing.league/files/lib/action/RacingLeagueDeleteResultAction.class.php

@@ -35 +35 @@
                         $res = WCF::getDB()->sendQuery($sql);
                         $row = WCF::getDB()->getAffectedRows($res);
+                        
+                        // Hier werden Strafen fÌr das Rennen gelöscht
+                        $sql = "DELETE FROM `wcf".WCF_N."_racing_punish`
+                                        WHERE `raceID` = '".escapeString($this->raceID)."'
+                                        ";                      
+                        WCF::getDB()->sendQuery($sql);
 
                         // Hier wird das Rennen wieder aktiviert (drived = 0)

racing.league/files/lib/action/RacingLeagueDeleteSaisonAction.class.php

@@ -63 +63 @@
                                         ";                      
                         WCF::getDB()->sendQuery($sql);
+                        
+                        $sql = "DELETE FROM `wcf".WCF_N."_racing_punish`
+                                        WHERE `saisonID` = '".escapeString($this->saisonID)."'
+                                        ";                      
+                        WCF::getDB()->sendQuery($sql);
 
                         if (WCF::getSession()->getVar('activeSaisonID') == $this->saisonID) {

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

@@ -21 +21 @@
         public $addPunish = 0;
         public $raceID = 0;
-        public $driver = 0;
+        public $driver = '';
         public $minusPoints = '';
         public $punishReason = '';
@@ -62 +62 @@
 
                 // driver
-                if (empty($this->driver)) {
+                if (empty($this->driver) && $this->addPunish == 3) {
                         throw new UserInputException('driver');
                 }
 
                 // punishReason
-                if (empty($this->punishReason)) {
+                if (empty($this->punishReason) && $this->addPunish == 3) {
                         throw new UserInputException('punishReason');
                 }                               
@@ -80 +80 @@
                 // Hier werden alle Rennen inklusive Strafen geladen
                 if ($this->activeSaisonID != 0) {
-                        
+                        $sql = "SELECT  `a`.*, 
+                                                        `b`.`username`,
+                                                        `b`.`userID`,
+                                                        `c`.`raceName`,
+                                                        `c`.`raceNo`
+                                FROM `wcf".WCF_N."_racing_punish` AS `a`
+                                LEFT JOIN `wcf".WCF_N."_user` AS `b`
+                                ON (`b`.`userID` = `a`.`userID`)
+                                LEFT JOIN `wcf".WCF_N."_racing_races` AS `c`
+                                ON (`a`.`raceID` = `c`.`raceID`)
+                                WHERE `a`.`saisonID` = '".$this->activeSaisonID."'
+                                AND `c`.`saisonID` = '".$this->activeSaisonID."'
+                                ORDER BY `raceNo` ASC                           
+                                ";
+                        $res = WCF::getDB()->sendQuery($sql);
+
+                        while ($row = WCF::getDB()->fetchArray($res)) {
+                                $this->punish[] = $row;
+                        }
                 }
 
                 if ($this->activeSaisonID != 0 && $this->addPunish == 1) {
                         // Hier werden alle gefahrenen Rennen geladen (drived = 1)
-                        $sql = "SELECT *
+                        $sql = "SELECT raceID, raceName
                                 FROM `wcf".WCF_N."_racing_races`
                                 WHERE `saisonID` = '".$this->activeSaisonID."'
@@ -112 +130 @@
                 parent::save();
 
-                if ($this->addPunish == 1 && isset($this->driver) && isset($this->minusPoints) && isset($this->punishReason) && $this->raceID > 0 && $this->activeSaisonID != 0) {
+                if ($this->addPunish == 3 && isset($this->driver) && isset($this->minusPoints) && isset($this->punishReason) && $this->raceID > 0 && $this->activeSaisonID != 0) {
                 
                         $sql = "INSERT INTO `wcf".WCF_N."_racing_punish`

racing.league/package.xml

@@ -11 +11 @@
                 <packagedescription language="de"><![CDATA[Mit diesem PlugIn werden PunktestÀnde einer laufenden Racing-Liga dargestellt.]]></packagedescription>
                 <packagedescription language="de-informal"><![CDATA[Mit diesem PlugIn werden PunktestÀnde einer laufenden Racing-Liga dargestellt.]]></packagedescription>
-                <version>1.0.0 beta 2</version>
-                <date>2008-10-11</date>
+                <version>1.0.0 beta 3</version>
+                <date>2008-11-11</date>
                 <plugin>com.woltlab.wcf</plugin>
                 <isunique>1</isunique>

racing.league/templates/racingLeaguePunish.tpl

@@ -38 +38 @@
 
         {if $addPunish == 1 && $raceID == 0}
-        //hier wird das Rennen ausgewÀhlt, in der die Straftat gefahren wurde
-        <form method="post" action="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1">
+        
+        <form method="post" action="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=2">
         <div class="border content">
                 <div class="container-1">               
@@ -50 +50 @@
                                 </div>
                                 <div class="formField">
-                                
+                                                                
                                 <select name='raceID'>
                                 {foreach from=$drivedRaces item=value}
-                                        <option value='{$value.raceID}'>{$value.raceName}<option>                               
+                                        <option value='{$value.raceID}'>{$value.raceName}</option>                              
                                 {/foreach}
                                 </select>
@@ -75 +75 @@
         {/if}
 
-        {if $addPunish == 1 && $raceID > 0}
-        //hier kann man die Strafe einem Fahrer zuordnen und den Grund sowie die Minuspunkte deklarieren.
-        <form method="post" action="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=1&amp;raceID={$raceID}">
+        {if $addPunish >= 2 && $raceID > 0}
+        
+        <form method="post" action="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;addPunish=3&amp;raceID={$raceID}">
         <div class="border content">
                 <div class="container-1">               
-                <h3 class="subHeadline"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /> {lang}wcf.racing.league.punish.addaddPunish{/lang}</h3>
-                        <p class="description">{lang}wcf.racing.league.punish.addaddPunish.description{/lang}</p>                                               
+                <h3 class="subHeadline"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" /> {lang}wcf.racing.league.punish.addPunish{/lang}</h3>
+                        <p class="description">{lang}wcf.racing.league.punish.addPunish.description{/lang}</p>                                          
                 <br />
                         <div class="formElement{if $errorField == 'driver'} formError{/if}">
@@ -92 +92 @@
                                         <option value="">----------</option>
                                 {foreach from=$users item=value}
-                                        <option value='{$value.userID}' {if $driver == $value.userID}selected{/if}>{$value.username}<option>                            
+                                        <option value='{$value.userID}' {if $driver == $value.userID}selected{/if}>{$value.username}</option>                           
                                 {/foreach}
                                 </select>
@@ -208 +208 @@
                                                         <col width="320">
                                                         <col width="80">
+                                                        <col width="80">
                                                         <col width="160">
                                                 </colgroup>
@@ -213 +214 @@
                                                 <thead>
                                                         <tr class="tableHead">
-                                                                <td align='center'>{lang}wcf.racing.league.results.raceNo{/lang}</td>
                                                                 <td align='center'>{lang}wcf.racing.league.results.racename{/lang}</td>
+                                                                <td align='center'>{lang}wcf.racing.league.results.username{/lang}</td>
+                                                                <td align='center'>{lang}wcf.racing.league.results.minuspoints{/lang}</td>
                                                                 <td align='center'>{lang}wcf.racing.league.results.punish{/lang}</td>
                                                                 <td align='center'>{lang}wcf.racing.league.results.action{/lang}</td>
@@ -223 +225 @@
                                                         
                                                         <tr class={cycle}>
-                                                        <td align='center'><strong>{$punish.raceNo}</strong></td>
-                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;punishRaceID={$punish.raceID}">{$punish.raceName}</a></td>
-                                                        <td align='center'></td>
-                                                        <td align='center'><a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;punishRaceID={$punish.raceID}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningAddS.png" alt="" title="{lang}wcf.racing.league.punish.Add{/lang}" /></a></td>
+                                                        <td align='center'><strong>{$punish.raceName}</strong></td>
+                                                        <td align='center'><a href="/index.php?page=User{@SID_ARG_2ND}&amp;userID={$punish.userID}">{$punish.username}</a></td>
+                                                        <td align='center'><strong>{$punish.minusPoints}</strong></td>
+                                                        <td align='center'>{$punish.punishReason}</td>
+                                                        <td align='center'>
+                                                                <a href="index.php?form=RacingLeaguePunish{@SID_ARG_2ND}&amp;punishRaceID={$punish.punishID}"><img src="{@RELATIVE_WCF_DIR}icon/saisonWarningEditS.png" alt="" title="{lang}wcf.racing.league.punish.edit{/lang}" /></a>
+                                                                <a href="index.php?action=RacingLeagueDeletePunish{@SID_ARG_2ND}&amp;punishID={$punish.punishID}" onclick="return confirm('{lang}wcf.racing.league.punish.delete.confirm{/lang}');"><img src="{@RELATIVE_WCF_DIR}icon/deleteS.png" alt="" title="{lang}wcf.racing.league.punish.delete{/lang}" /></a>
+                                                        </td>
                                                         </tr>