generateUniqueId() and more useless/deprecated methods removed, code speed-up, link...

[shipsimu.git] / application / ship-simu / main / class_WorksContract.php

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index 4a6005911552cce971e9537011f4c59afa048d23..7f61096fc5a532879b97652195be0a38d939b722 100644 (file)
--- a/application/ship-simu/main/class_WorksContract.php
+++ b/application/ship-simu/main/class_WorksContract.php
@@ -45,14 +45,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set description
-               $this->setObjectDescription("Bauvertrag");
-
-               // Unique-ID generieren
-               $this->generateUniqueId();
-
                // Clean up a little
                $this->removeSystemArray();
+               $this->removeNumberFormaters();
        }
 
        // Neuen Bauvertrag generieren
@@ -64,15 +59,6 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                // Get new instance
                $contractInstance = new WorksContract();
 
-               // Debug-Meldung ausgeben
-               if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $contractInstance->debugOutput(sprintf("[%s:%d] Neuer Bauvertrag wird f&uuml;r das Schiff <strong>%s</strong> mit der <strong>%s</strong> <strong>%s</strong> erstellt.",
-                       __CLASS__,
-                       __LINE__,
-                       $shipName,
-                       $partnerInstance->getObjectDescription(),
-                       $partnerInstance->getCompanyName()
-               ));
-
                // Schiffsnamen setzen
                $contractInstance->setShipName($shipName);
 
@@ -166,23 +152,8 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                // Get price for this item
                $price = $this->getMerchantInstance()->getPriceFromList($partInstance);
 
-               // Final debug message
-               if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] <strong>%s</strong> kostet <strong>%s</strong>.",
-                       __CLASS__,
-                       __LINE__,
-                       $partInstance->getObjectDescription(),
-                       $this->getMerchantInstance()->formatCurrency($price)
-               ));
-
                // Add price
                $partInstance->setPrice($price);
-
-               // Final debug message
-               if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] <strong>%s</strong> wurde in den Bauvertrag aufgenommen.",
-                       __CLASS__,
-                       __LINE__,
-                       $partInstance->getObjectDescription()
-               ));
        }
 
        // Setter for contract partner