From 9237571bcfa5f4ab4b994f2c6fcbf8f2e7ed8637 Mon Sep 17 00:00:00 2001 From: Garrett Date: Mon, 7 Dec 2020 05:48:24 +0000 Subject: [PATCH] 0.3.12 --- CHANGELOG | 4 ++ includes/Update.class.php | 14 ++++ includes/content-build-objects.php | 78 +++++++++------------ includes/content-custom_style.php | 106 ++--------------------------- includes/definitions.php | 4 +- install/Install.class.php | 2 +- 6 files changed, 59 insertions(+), 149 deletions(-) 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 '
'; - // Partition Width - echo '
'; - // Partition Height - echo '
'; - echo '
'; - for($encX=0; $encX<$templateOrganic['templateEncLayoutX']; $encX++) { - echo '
'; - if($encX == 0) { - $objClassArray = array( - 'stockObj', - $cursorClass, - 'insertDraggable' - ); - - $templateFace = 0; - $objID = false; - echo $qls->App->generateObjContainer($templateOrganic, $templateFace, $objClassArray, $isCombinedTemplate, $objID, $categoryData); - echo $qls->App->buildStandard($partitionData, $isCombinedTemplate); - echo '
'; - } + // Flex Container + //echo '
'; + echo '
'; + // Partition Width + echo '
'; + // Partition Height + //echo '
'; + echo '
'; + echo '
'; + for($encX=0; $encX<$templateOrganic['templateEncLayoutX']; $encX++) { + echo '
'; + if($encX == 0) { + $objClassArray = array( + 'stockObj', + $cursorClass, + 'insertDraggable' + ); + + $templateFace = 0; + $objID = false; + echo $qls->App->generateObjContainer($templateOrganic, $templateFace, $objClassArray, $isCombinedTemplate, $objID, $categoryData); + echo $qls->App->buildStandard($partitionData, $isCombinedTemplate); echo '
'; } echo '
'; + } echo '
'; echo '
'; echo '
'; + echo '
'; } echo '
'; } diff --git a/includes/content-custom_style.php b/includes/content-custom_style.php index ac976c1..fa1067d 100755 --- a/includes/content-custom_style.php +++ b/includes/content-custom_style.php @@ -24,6 +24,12 @@ function color_inverse($color){ } return '#'.$rgb; } + +for($x=1; $x .navTree { @@ -310,106 +316,6 @@ function color_inverse($color){ -webkit-print-color-adjust: exact; } -.RU1 { - height: 25px; -} - -.RU2 { - height: 50px; -} - -.RU3 { - height: 75px; -} - -.RU4 { - height: 100px; -} - -.RU5 { - height: 125px; -} - -.RU6 { - height: 150px; -} - -.RU7 { - height: 175px; -} - -.RU8 { - height: 200px; -} - -.RU9 { - height: 225px; -} - -.RU10 { - height: 250px; -} - -.RU11 { - height: 275px; -} - -.RU12 { - height: 300px; -} - -.RU13 { - height: 325px; -} - -.RU14 { - height: 350px; -} - -.RU15 { - height: 375px; -} - -.RU16 { - height: 400px; -} - -.RU17 { - height: 425px; -} - -.RU18 { - height: 450px; -} - -.RU19 { - height: 475px; -} - -.RU20 { - height: 500px; -} - -.RU21 { - height: 525px; -} - -.RU22 { - height: 550px; -} - -.RU23 { - height: 575px; -} - -.RU24 { - height: 600px; -} - -.RU25 { - height: 625px; -} - .flex-container { display: flex; height: 100%; diff --git a/includes/definitions.php b/includes/definitions.php index 1205bc8..363ab91 100755 --- a/includes/definitions.php +++ b/includes/definitions.php @@ -3,13 +3,15 @@ define('AVAILABLE_CABLE_END_ID_COUNT', 100); define('MAX_WALLJACK_PORTID', 100); define('DEFAULT_FLOORPLAN_IMG', 'floorplan-default.png'); -define('PCM_VERSION', '0.3.11'); +define('PCM_VERSION', '0.3.12'); define('NEW_OBJECT_PREFIX', 'Object_'); define('NEW_LOCATION_PREFIX', 'Location_'); define('NEW_POD_PREFIX', 'Pod_'); define('NEW_CABINET_PREFIX', 'Cabinet_'); define('NEW_FLOORPLAN_PREFIX', 'Floorplan_'); +define('RU_HEIGHT', 25); +define('MAX_TEMPLATE_RU', 25); define('PATH_FINDER_MAX_RESULTS', 20); define('PATH_FINDER_MAX_RESULTS_DEFAULT', 10); diff --git a/install/Install.class.php b/install/Install.class.php index f1b500f..a5cca8e 100755 --- a/install/Install.class.php +++ b/install/Install.class.php @@ -37,7 +37,7 @@ class Install { * @var string $system_version - The version of the system */ var $system_version = '3.1.11'; -var $app_version = '0.3.11'; +var $app_version = '0.3.12'; /** * @var string $install_error - Contains the installation error