Changeset 495

Timestamp:

Mar 1, 2013, 11:02:44 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Pozice subjektu na mapě se nyní zadává jako odkaz do tabulky MapPosition.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• admin/Updates.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 494; // Subversion revision
-$DatabaseRevision = 494; 
+$Revision = 495; // Subversion revision
+$DatabaseRevision = 495; 
 $ReleaseTime = '2013-03-01';
 

trunk/admin/Updates.php

@@ -13 +13 @@
 }
 
-
+function UpdateTo495($Manager)
+{
+  $Manager->Execute("INSERT INTO `MapPosition` (SELECT NULL AS `Id`, `Name`, `MapPositionX` AS `Latitude`, `MapPositionY` AS `Longitude` FROM `Subject`)");
+  $Manager->Execute("ALTER TABLE `Subject` ADD `MapPosition` INT NULL AFTER `PayVAT`");
+  $Manager->Execute("UPDATE `Subject` SET `MapPosition` = (SELECT `MapPosition`.`Id` FROM `MapPosition` WHERE `MapPosition`.`Name` = `Subject`.`Name` LIMIT 1)");
+  $Manager->Execute("ALTER TABLE `Subject`  DROP `MapPositionX`,  DROP `MapPositionY`;");
+  $Manager->Execute("ALTER TABLE `Subject` ADD INDEX ( `MapPosition` ) ");
+  $Manager->Execute("ALTER TABLE `Subject` ADD FOREIGN KEY ( `MapPosition` ) REFERENCES `MapPosition` (".
+    "`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
+}
 
 $Updates = array(
         491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
   493 => array('Revision' => 494, 'Function' => 'UpdateTo494'),
+  494 => array('Revision' => 495, 'Function' => 'UpdateTo495'),
 );
 

trunk/form_classes.php

@@ -397 +397 @@
       'IC' => array('Type' => 'String', 'Caption' => 'IČ', 'Default' => ''),
       'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),
-      'MapPositionX' => array('Type' => 'Float', 'Caption' => 'Pozice X', 'Default' => '0'),
-      'MapPositionY' => array('Type' => 'Float', 'Caption' => 'Pozice Y', 'Default' => ''),
+      'MapPosition' => array('Type' => 'TMapPosition', 'Caption' => 'Pozice na mapě', 'Default' => '', 'Null' => true),
       'WWW' => array('Type' => 'Hyperlink', 'Caption' => 'WWW', 'Default' => ''),
       'Note' => array('Type' => 'String', 'Caption' => 'Poznámka', 'Default' => ''),