From 175aebaa1460c2495965c1e4774692685daf0f81 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Wed, 3 Mar 2021 10:06:10 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03570=20Migrate=20Synchro=20data=20source?= =?UTF-8?q?=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/backoffice/pages/_all.scss | 3 +- css/backoffice/pages/_data-syncro.scss | 66 +++++++++++++++++++++++++ synchro/synchrodatasource.class.inc.php | 44 +++++++---------- 3 files changed, 87 insertions(+), 26 deletions(-) create mode 100644 css/backoffice/pages/_data-syncro.scss diff --git a/css/backoffice/pages/_all.scss b/css/backoffice/pages/_all.scss index 2b532ff24..375dbfba0 100644 --- a/css/backoffice/pages/_all.scss +++ b/css/backoffice/pages/_all.scss @@ -21,4 +21,5 @@ @import "attachments"; @import "tabularfieldsselector"; @import "impact-analysis"; -@import "audit"; \ No newline at end of file +@import "audit"; +@import "data-syncro"; \ No newline at end of file diff --git a/css/backoffice/pages/_data-syncro.scss b/css/backoffice/pages/_data-syncro.scss new file mode 100644 index 000000000..6f29a160e --- /dev/null +++ b/css/backoffice/pages/_data-syncro.scss @@ -0,0 +1,66 @@ +$ibo-data-synchro-source--replicas-status--is-light--opacity: 0.5 !default; + +$ibo-data-synchro-source--replicas-table--cell--padding: 10px !default; +$ibo-data-synchro-source--replicas-table--cell--min-width: 200px !default; +$ibo-data-synchro-source--replicas-table--cell--arrow--min-width: 100px !default; + +$ibo-data-synchro-source--replicas-status--warning--margin: 0 5px 0 8px !default; + +$ibo-data-synchro-source--replicas-status--color: ( + 'grey': ( + $ibo-color-grey-400, + $ibo-color-grey-900, + ), + 'orange': ( + $ibo-color-orange-300, + $ibo-color-orange-900, + ), + 'bluegrey': ( + $ibo-color-blue-grey-200, + $ibo-color-blue-grey-900, + ), + 'red': ( + $ibo-color-red-300, + $ibo-color-red-900, + ), + 'blue': ( + $ibo-color-blue-200, + $ibo-color-blue-900, + ), + 'green': ( + $ibo-color-green-100, + $ibo-color-green-900, + ), + 'cyan': ( + $ibo-color-cyan-100, + $ibo-color-cyan-900, + ), +) !default; + +@each $sColor, $aAttributes in $ibo-data-synchro-source--replicas-status--color { + $bg-color: nth($aAttributes, 1); + $color: nth($aAttributes, 2); + .ibo-data-synchro-source--replicas-status.ibo-is-#{$sColor}{ + color: $color; + background-color: $bg-color; + } +} + +.ibo-data-synchro-source--replicas-status.ibo-is-light{ + opacity: $ibo-data-synchro-source--replicas-status--is-light--opacity; + &:hover{ + opacity: 1; + } +} +.synoptics tr td{ + padding: $ibo-data-synchro-source--replicas-table--cell--padding; + min-width: $ibo-data-synchro-source--replicas-table--cell--min-width; + vertical-align: middle; + text-align: center; + &.arrow{ + min-width: $ibo-data-synchro-source--replicas-table--cell--arrow--min-width; + } +} +.ibo-data-synchro-source--replicas-status--warning{ + margin: $ibo-data-synchro-source--replicas-status--warning--margin; +} \ No newline at end of file diff --git a/synchro/synchrodatasource.class.inc.php b/synchro/synchrodatasource.class.inc.php index c7d9648f1..153ff7fd4 100644 --- a/synchro/synchrodatasource.class.inc.php +++ b/synchro/synchrodatasource.class.inc.php @@ -421,7 +421,7 @@ class SynchroDataSource extends cmdbAbstractObject $sAllWarnings).''); } - $oPage->add('
'); + $oPage->add(''); + $oPage->add($this->HtmlBox('repl_ignored', $aData, 'grey').''); $oPage->add("\n"); - $oPage->add($this->HtmlBox('repl_disappeared', $aData, '#630', - 'rowspan="4"').''.$this->HtmlBox('obj_disappeared_no_action', $aData, '#333')); + $oPage->add($this->HtmlBox('repl_disappeared', $aData, 'orange', + 'rowspan="4"').''.$this->HtmlBox('obj_disappeared_no_action', $aData, 'grey')); $oPage->add("\n"); - $oPage->add($this->HtmlBox('obj_deleted', $aData, '#000')); + $oPage->add($this->HtmlBox('obj_deleted', $aData, 'bluegrey')); $oPage->add("\n"); - $oPage->add($this->HtmlBox('obj_obsoleted', $aData, '#630')); + $oPage->add($this->HtmlBox('obj_obsoleted', $aData, 'orange')); $oPage->add("\n"); $sOQL = urlencode($sBaseOQL." AND status='obsolete'"); - $oPage->add($this->HtmlBox('obj_disappeared_errors', $aData, '#C00', '', + $oPage->add($this->HtmlBox('obj_disappeared_errors', $aData, 'red', '', " Show")); $oPage->add("\n"); - $oPage->add($this->HtmlBox('repl_existing', $aData, '#093', - 'rowspan="3"').''.$this->HtmlBox('obj_unchanged', $aData, '#393')); + $oPage->add($this->HtmlBox('repl_existing', $aData, 'green', + 'rowspan="3"').''.$this->HtmlBox('obj_unchanged', $aData, 'blue')); $oPage->add("\n"); - $oPage->add($this->HtmlBox('obj_updated', $aData, '#3C3')); + $oPage->add($this->HtmlBox('obj_updated', $aData, 'green')); $oPage->add("\n"); $sOQL = urlencode($sBaseOQL." AND status='modified'"); - $oPage->add($this->HtmlBox('obj_updated_errors', $aData, '#C00', '', + $oPage->add($this->HtmlBox('obj_updated_errors', $aData, 'red', '', " Show")); $oPage->add("\n"); - $oPage->add($this->HtmlBox('repl_new', $aData, '#339', - 'rowspan="4"').''.$this->HtmlBox('obj_new_unchanged', $aData, '#393')); + $oPage->add($this->HtmlBox('repl_new', $aData, 'cyan', + 'rowspan="4"').''.$this->HtmlBox('obj_new_unchanged', $aData, 'blue')); $oPage->add("\n"); - $oPage->add($this->HtmlBox('obj_new_updated', $aData, '#3C3')); + $oPage->add($this->HtmlBox('obj_new_updated', $aData, 'green')); $oPage->add("\n"); - $oPage->add($this->HtmlBox('obj_created', $aData, '#339')); + $oPage->add($this->HtmlBox('obj_created', $aData, 'cyan')); $oPage->add("\n"); $sOQL = urlencode($sBaseOQL." AND status='new'"); - $oPage->add($this->HtmlBox('obj_new_errors', $aData, '#C00', '', + $oPage->add($this->HtmlBox('obj_new_errors', $aData, 'red', '', " Show")); $oPage->add("\n
'); // List all the log entries for the user to select $oPage->add('

'.Dict::S('Core:Synchro:History').'

'); @@ -458,12 +458,6 @@ class SynchroDataSource extends cmdbAbstractObject var aValues = aSynchroLog[id]; if (aValues == undefined) return; - for (var sKey in aValues) - { - $('#c_'+sKey).html(aValues[sKey]); - var fOpacity = (aValues[sKey] == 0) ? 0.3 : 1; - $('#'+sKey).fadeTo("slow", fOpacity); - } //alert('id = '+id+', lastLog='+sLastLog+', id==sLastLog: '+(id==sLastLog)+' obj_updated_errors: '+aValues['obj_updated_errors']); if ( (id == sLastLog) && (aValues['obj_new_errors'] > 0) ) { @@ -522,37 +516,37 @@ JS; EOF ); $sBaseOQL = 'SELECT SynchroReplica WHERE sync_source_id='.$this->GetKey()." AND status_last_error!=''"; - $oPage->add($this->HtmlBox('repl_ignored', $aData, '#999').'		  
=>
=>
=>
\n"); $oPage->add('
'); @@ -570,13 +564,13 @@ EOF $iCount = $aData[$sId]; $sCount = "$iCount"; $sLabel = Dict::Format('Core:Synchro:label_'.$sId, $sCount); - $sOpacity = ($iCount == 0) ? 'opacity:0.3;' : ''; + $sOpacity = ($iCount == 0) ? 'ibo-is-light' : ''; if (isset($aData[$sId.'_warnings'])) { - $sLabel .= " (".$aData[$sId.'_warnings'].')'; + $sLabel .= " (".$aData[$sId.'_warnings'].')'; } - return "{$sLabel}{$sErrorLink}"; + return ''.$sLabel.$sErrorLink.''; } protected function ProcessLog($oLastLog)