diff --git a/CHANGELOG b/CHANGELOG index 477df04..9593993 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ ChangeLog for PatchCableMgr **************************************************** Contents + - Changes Introduced In 0.3.12 - Changes Introduced In 0.3.11 - Changes Introduced In 0.3.10 - Changes Introduced In 0.3.9 @@ -30,6 +31,9 @@ Contents **************************************************** \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ +**Changes introduced in 0.3.12 +[Fix] Corrected nested insert size as displayed in "Available Templates" box + **Changes introduced in 0.3.11 [Enhance] Added ability to create inserts with enclosure partitions [Fix] Validate trunked partitions are not connected to each other diff --git a/includes/Update.class.php b/includes/Update.class.php index 4c3b324..d0993e1 100755 --- a/includes/Update.class.php +++ b/includes/Update.class.php @@ -96,6 +96,8 @@ var $qls; $this->update_039_to_0310(); } else if($this->currentVersion == '0.3.10') { $this->update_0310_to_0311(); + } else if($this->currentVersion == '0.3.11') { + $this->update_0311_to_0312(); } else { return true; } @@ -104,6 +106,18 @@ var $qls; return false; } + /** + * Update from version 0.3.10 to 0.3.11 + * @return Boolean + */ + function update_0311_to_0312() { + $incrementalVersion = '0.3.12'; + + // Set app version to 0.3.12 + $this->qls->SQL->update('app_organization_data', array('version' => $incrementalVersion), array('id' => array('=', 1))); + + } + /** * Update from version 0.3.10 to 0.3.11 * @return Boolean diff --git a/includes/content-build-objects.php b/includes/content-build-objects.php index 70f87ee..4a96941 100755 --- a/includes/content-build-objects.php +++ b/includes/content-build-objects.php @@ -83,67 +83,51 @@ for ($x=0; $x<$faceCount; $x++){ // Further calculate template height & width if nested insert if(isset($templateOrganic['nestedParentHUnits']) and isset($templateOrganic['nestedParentVUnits'])) { - $nestedParentHUnits = $templateOrganic['nestedParentHUnits']; - $nestedParentVUnits = $templateOrganic['nestedParentVUnits']; + //$nestedParentHUnits = $templateOrganic['nestedParentHUnits']; + //$nestedParentVUnits = $templateOrganic['nestedParentVUnits']; $nestedParentEncLayoutX = $templateOrganic['nestedParentEncLayoutX']; $nestedParentEncLayoutY = $templateOrganic['nestedParentEncLayoutY']; - $parentFlexWidth = ($nestedParentHUnits / 24) / $nestedParentEncLayoutX; - $parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY; - //$flexWidth = $parentFlexWidth * $flexWidth; - $flexWidth = $parentFlexWidth; - $flexHeight = $parentFlexHeight * $flexHeight; - } - - /* - if(isset($templateOrganic['nestedParentHUnits']) and isset($templateOrganic['nestedParentVUnits'])) { - $nestedParentHUnits = $templateOrganic['nestedParentHUnits']; - $nestedParentVUnits = $templateOrganic['nestedParentVUnits']; - $nestedParentEncLayoutX = $templateOrganic['nestedParentEncLayoutX']; - $nestedParentEncLayoutY = $templateOrganic['nestedParentEncLayoutY']; + //$parentFlexWidth = ($nestedParentHUnits / 24) / $nestedParentEncLayoutX; + $parentFlexWidth = $flexWidth / $nestedParentEncLayoutX; + $parentFlexHeight = $flexHeight / $nestedParentEncLayoutY; + //$parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY; - $parentFlexWidth = ($nestedParentHUnits / 24) / $nestedParentEncLayoutX; - $parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY; $flexWidth = $parentFlexWidth; + //$flexHeight = $parentFlexHeight * $flexHeight; $flexHeight = $parentFlexHeight; - } else { - $totalVUnits = $minRUSize * 2; - $heightNumerator = $vUnits/$totalVUnits; - $flexWidth = $hUnits/24; - $flexHeight = $heightNumerator/$templateOrganic['templateEncLayoutY']; } - */ - - //$minRUSize = ceil($vUnits/2); - // Flex Container - echo '