mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.12

Browse Source
This commit is contained in:
Garrett 2020-12-07 05:48:24 +00:00
parent 0e3d07d3d9
commit 9237571bcf
6 changed files with 59 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -5,6 +5,7 @@ ChangeLog for PatchCableMgr
**************************************************** ****************************************************
Contents Contents
- Changes Introduced In 0.3.12
- Changes Introduced In 0.3.11 - Changes Introduced In 0.3.11
- Changes Introduced In 0.3.10 - Changes Introduced In 0.3.10
- Changes Introduced In 0.3.9 - 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 **Changes introduced in 0.3.11
[Enhance] Added ability to create inserts with enclosure partitions [Enhance] Added ability to create inserts with enclosure partitions
[Fix] Validate trunked partitions are not connected to each other [Fix] Validate trunked partitions are not connected to each other

14
includes/Update.class.php
View File

@ -96,6 +96,8 @@ var $qls;
$this->update_039_to_0310(); $this->update_039_to_0310();
} else if($this->currentVersion == '0.3.10') { } else if($this->currentVersion == '0.3.10') {
$this->update_0310_to_0311(); $this->update_0310_to_0311();
} else if($this->currentVersion == '0.3.11') {
$this->update_0311_to_0312();
} else { } else {
return true; return true;
} }
@ -104,6 +106,18 @@ var $qls;
return false; 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 * Update from version 0.3.10 to 0.3.11
* @return Boolean * @return Boolean

76
includes/content-build-objects.php
View File

@ -83,67 +83,51 @@ for ($x=0; $x<$faceCount; $x++){
// Further calculate template height & width if nested insert // Further calculate template height & width if nested insert
if(isset($templateOrganic['nestedParentHUnits']) and isset($templateOrganic['nestedParentVUnits'])) { if(isset($templateOrganic['nestedParentHUnits']) and isset($templateOrganic['nestedParentVUnits'])) {
$nestedParentHUnits = $templateOrganic['nestedParentHUnits']; //$nestedParentHUnits = $templateOrganic['nestedParentHUnits'];
$nestedParentVUnits = $templateOrganic['nestedParentVUnits']; //$nestedParentVUnits = $templateOrganic['nestedParentVUnits'];
$nestedParentEncLayoutX = $templateOrganic['nestedParentEncLayoutX']; $nestedParentEncLayoutX = $templateOrganic['nestedParentEncLayoutX'];
$nestedParentEncLayoutY = $templateOrganic['nestedParentEncLayoutY']; $nestedParentEncLayoutY = $templateOrganic['nestedParentEncLayoutY'];
$parentFlexWidth = ($nestedParentHUnits / 24) / $nestedParentEncLayoutX; //$parentFlexWidth = ($nestedParentHUnits / 24) / $nestedParentEncLayoutX;
$parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY; $parentFlexWidth = $flexWidth / $nestedParentEncLayoutX;
//$flexWidth = $parentFlexWidth * $flexWidth; $parentFlexHeight = $flexHeight / $nestedParentEncLayoutY;
$flexWidth = $parentFlexWidth; //$parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY;
$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;
$parentFlexHeight = ($nestedParentVUnits / ($RUSize * 2)) / $nestedParentEncLayoutY;
$flexWidth = $parentFlexWidth; $flexWidth = $parentFlexWidth;
//$flexHeight = $parentFlexHeight * $flexHeight;
$flexHeight = $parentFlexHeight; $flexHeight = $parentFlexHeight;
} else {
$totalVUnits = $minRUSize * 2;
$heightNumerator = $vUnits/$totalVUnits;
$flexWidth = $hUnits/24;
$flexHeight = $heightNumerator/$templateOrganic['templateEncLayoutY'];
} }
*/
//$minRUSize = ceil($vUnits/2); // Flex Container
//echo '<div class="RU'.$minRUSize.'" style="display:flex;flex-direction:row;">';
echo '<div style="height:'.round(($minRUSize*25)*$flexHeight).'px;display:flex;flex-direction:row;">';
// Partition Width
echo '<div class="flex-container" style="flex-direction:column;flex:'.$flexWidth.';">';
// Partition Height
//echo '<div class="flex-container" style="flex:'.$flexHeight.';">';
echo '<div class="flex-container" style="flex:1;">';
echo '<div class="tableRow">';
for($encX=0; $encX<$templateOrganic['templateEncLayoutX']; $encX++) {
echo '<div class="tableCol">';
if($encX == 0) {
$objClassArray = array(
'stockObj',
$cursorClass,
'insertDraggable'
);
// Flex Container $templateFace = 0;
echo '<div class="RU'.$minRUSize.'" style="display:flex;flex-direction:row;">'; $objID = false;
// Partition Width echo $qls->App->generateObjContainer($templateOrganic, $templateFace, $objClassArray, $isCombinedTemplate, $objID, $categoryData);
echo '<div class="flex-container" style="flex-direction:column;flex:'.$flexWidth.';">'; echo $qls->App->buildStandard($partitionData, $isCombinedTemplate);
// Partition Height
echo '<div class="flex-container" style="flex:'.$flexHeight.';">';
echo '<div class="tableRow">';
for($encX=0; $encX<$templateOrganic['templateEncLayoutX']; $encX++) {
echo '<div class="tableCol">';
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 '</div>';
}
echo '</div>'; echo '</div>';
} }
echo '</div>'; echo '</div>';
}
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>';
} }
echo '</div>'; echo '</div>';
} }

106
includes/content-custom_style.php
View File

@ -24,6 +24,12 @@ function color_inverse($color){
} }
return '#'.$rgb; return '#'.$rgb;
} }
for($x=1; $x<MAX_TEMPLATE_RU; $x++) {
echo '.RU'.$x.' {';
echo 'height: '.$x*RU_HEIGHT.'px;';
echo '}';
}
?> ?>
.navTree { .navTree {
@ -310,106 +316,6 @@ function color_inverse($color){
-webkit-print-color-adjust: exact; -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 { .flex-container {
display: flex; display: flex;
height: 100%; height: 100%;

4
includes/definitions.php
View File

@ -3,13 +3,15 @@
define('AVAILABLE_CABLE_END_ID_COUNT', 100); define('AVAILABLE_CABLE_END_ID_COUNT', 100);
define('MAX_WALLJACK_PORTID', 100); define('MAX_WALLJACK_PORTID', 100);
define('DEFAULT_FLOORPLAN_IMG', 'floorplan-default.png'); 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_OBJECT_PREFIX', 'Object_');
define('NEW_LOCATION_PREFIX', 'Location_'); define('NEW_LOCATION_PREFIX', 'Location_');
define('NEW_POD_PREFIX', 'Pod_'); define('NEW_POD_PREFIX', 'Pod_');
define('NEW_CABINET_PREFIX', 'Cabinet_'); define('NEW_CABINET_PREFIX', 'Cabinet_');
define('NEW_FLOORPLAN_PREFIX', 'Floorplan_'); 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', 20);
define('PATH_FINDER_MAX_RESULTS_DEFAULT', 10); define('PATH_FINDER_MAX_RESULTS_DEFAULT', 10);

2
install/Install.class.php
View File

@ -37,7 +37,7 @@ class Install {
* @var string $system_version - The version of the system * @var string $system_version - The version of the system
*/ */
var $system_version = '3.1.11'; 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 * @var string $install_error - Contains the installation error