intia-theme 0.1.64 → 0.1.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f9927c2d30d0febbc145d1df8275c78bf5097b59952e912de8d1b44aab7b3a
-  data.tar.gz: 4efedd31105a649be4c1319e2a316acac9fd2d8fa2fd292e9027ab7de1213e68
+  metadata.gz: d5d323ddb6b3bcf99ad7857a29b711a13c2007aa0dcabeeb1e866bd09bb88745
+  data.tar.gz: 23f366236d0f75aeaa6402068549f34abf7515dee1b85351f73ee3d24f1790e9
 SHA512:
-  metadata.gz: ac6f65dde41dead07bf4e9e877687e2039685ef2df32e3b790b5e26cf742cd479eb7cdf2e871a356569e455e78bb2579caa3c86b2fd6daed194a19b7f59b4ca5
-  data.tar.gz: ebdc0b7851d92efb3d8e330dfa5bfe40307b1b1c49fba9090ed04f891a28df66278f53b8a8000f3277b5c96c8cda96a0b4d922dbbd2c765a12411917e6228ee7
+  metadata.gz: '01950484992fb6e3d6eaac2876c82c5fe2e05b8e7df62e8dd79fe958089be2065c698e7e39a5f1236e279e2b72276b0b3b168727ed14c195ac301bbef9531d00'
+  data.tar.gz: b55d6fd45227ee7fa6958d63b3aa2b2f98047c299a6b2573642f4d76a9a4aee671dd8f66d72e9f1d7951a67efcf05fc0bd079b8b16bbb5b2d1b185767f8856ff

data/_sass/_radar.scss

@@ -144,6 +144,7 @@
         position: relative;    
         border-radius: var(--borderRadius);
         padding:  var(--textPadding);
+        max-width: 300px;
         cursor: pointer;
     }
     .radarContainer .cardItem:hover{
@@ -260,7 +261,7 @@
     }
     .radarLegend .stateColor{
         position: absolute;
-        top: 25%;
+        top: 35%;
         width: var(--radarLegendCardItemText);
         height: var(--radarLegendCardItemText);
         border-radius: 50%;

data/assets/js/radar.js

@@ -220,11 +220,11 @@ function createRadar(config, structure, entries){
         let color = (blip.stateID >= 0 && blip.stateID < structure.entryStates.list.length)
             ? d3.rgb(structure.entryStates.list[blip.stateID].color)
             : d3.rgb(config.blip.defaultColor);
-        if(blip.moved != 0) color.opacity = 0.25; 
+        if(false) color.opacity = 0.25; //blip.moved != 0
         return color;
     }
     let getBlipMovedIndicator = (blip) => {
-        if(blip.moved != 0){
+        if(false){ // blip.moved != 0
             let radius = config.blip.outerCircleRadius;
 
             let startAngle = (blip.moved > 0) 
@@ -391,7 +391,7 @@ function createRadar(config, structure, entries){
         blipRadius = blipSize * 0.5,
         strokeWidth = blipRadius * 0.2,
         outerCircleRadius = blipRadius ,
-        innerCircleRadius = outerCircleRadius - strokeWidth; 
+        innerCircleRadius = outerCircleRadius; 
     config.blip = ({
         ...config.blip,
         fontSize: fontSize,
@@ -416,13 +416,20 @@ function createRadar(config, structure, entries){
             .classed(`radarTitle`, true)
             .text(config.radar.name);
     }
+    // Select sector buttons
+    radarDiv.append('div')
+    .attr(`id`, `${radarId}_selectionDropdown`)
+        .classed(`buttons`, true); 
+    
     // select sector dropdown
+    /*
     radarDiv.append(`div`)
         .attr(`id`, `${radarId}_selectionDropdown`)
-        .classed(`radarSelection dropdown`, true);   
+        .classed(`radarSelection dropdown`, true);
+    */  
     radarDiv.append(`div`)
         .classed(`radar`, true)
-        .attr(`id`, `${radarId}_radarDiv`);
+        .attr(`id`, `${radarId}_radarDiv`);  
     /*
     radarDiv.append(`div`)
         .classed(`radarBlipLegend`, true);
@@ -441,7 +448,10 @@ function createRadar(config, structure, entries){
     radarDiv.select(`svg#${radarId}_svg`).append(`g`)
                 .attr(`id`, `${radarId}_radarContent`)
                 .attr(`transform`, translate(radius, radius));
+
+    // See below for variante without dropdown
     // append radar legend div
+    /*
     radarDiv.select(`.radar`)
         .append(`div`)
         .attr(`id`, `${radarId}_radarLegend`)
@@ -449,6 +459,7 @@ function createRadar(config, structure, entries){
         .on(`click`, ()=>
             document.getElementById(`${radarId}_radarLegend`).classList.toggle(`active`))
         .text(config.radar.legendDropdownText);
+    */
     //#endregion ________________________________________________________________________
 
     // can be declared only after the radar svg is appended
@@ -514,7 +525,7 @@ function createRadar(config, structure, entries){
     let blipClick = (blip) => {
         let blipData = radarData.blips.find(data => data.id == blip.id);
         if (blipData.focused){
-            window.open(blipData.link);
+            window.open(config.radar.linkPrefix + blipData.link + config.radar.linkSuffix);
         }
         else blipData.focused = true;
     }
@@ -743,6 +754,34 @@ function createRadar(config, structure, entries){
     //#endregion ------------------------------------------------------------------------
 
     //#region generate selection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    
+    radarDiv.select(`.buttons`)
+    .append('a')
+        .classed('button',true)
+        .classed('is-rounded',true)
+        .classed('is-dark',true)
+        .text(config.radar.showAllSectorsText)
+        .on(`click`, () => {    
+            displayAllSectors();
+            changeSvgViewbox(`${radarId}_radarContent`);
+            selectionDropdownText.text(config.radar.showAllSectorsText);
+        });    
+    radarDiv.select(`.buttons`)
+        .selectAll(null)
+        .data(radarData.sectors)
+        .enter()
+        .append(`a`)
+            .classed('button',true)
+            .classed('is-rounded',true)
+            .classed('is-dark',true)
+            .text(sector => sector.name)
+            .on(`click`, sector => {    
+                displaySector(sector);
+                changeSvgViewbox(sector.idText);
+                selectionDropdownText.text(sector.name);
+            });    
+
+
     let selectionDropdownText = radarDiv.select(`.radarSelection`)
         .on(`click`, ()=> {
             document.getElementById(`${radarId}_selectionDropdown`)
@@ -780,7 +819,9 @@ function createRadar(config, structure, entries){
                 displaySector(sector);
                 changeSvgViewbox(sector.idText);
                 selectionDropdownText.text(sector.name);
-            });            
+            });    
+            
+    
     //#endregion ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     //#region generate radar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -809,6 +850,37 @@ function createRadar(config, structure, entries){
     //#endregion ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     //#region generate radar legend +++++++++++++++++++++++++++++++++++++++++++++++++++++
+    // Legend without dropdown
+    radarDiv.select(`.radar`)
+        .append(`div`)
+        .attr(`id`, `${radarId}_radarLegend`)
+        .classed(`radarLegend`, true)
+        .text(config.radar.legendDropdownText);
+    
+    let radarLegendContainer = radarDiv.select(`.radarLegend`)
+        .selectAll(null)
+        .data(structure.entryStates.list)
+        .enter()
+        .append(`div`)
+            .classed(`cardItem`, true)
+            .call(makeLegendBlipStates)
+            .on(`mouseover`, (data)=> focusBlipByState(data))
+            .on(`mouseout`, data => focusAllBlips(data)); 
+
+
+    let ringLegend = radarDiv.select(`.radar`).append(`div`)
+        ringLegend.append(`div`)
+            .classed(`radarLegend`, true)
+            .text(structure.rings.legendTitle);
+        ringLegend.selectAll(null)
+            .data(radarData.rings)
+            .enter()
+            .append(`div`)
+                .classed(`cardItem`, true)
+                .call(makeLegendRings)
+                .on(`mouseover`, (data)=> focusRing(data))
+                .on(`mouseout`, ()=> focusAllRings());
+    /*
     let radarLegendContainer = radarDiv.select(`.radarLegend`)
         .append(`div`)
         .attr(`id`, `${radarId}_radarLegendContainer`)
@@ -858,6 +930,7 @@ function createRadar(config, structure, entries){
             .call(makeLegendRings)
             .on(`mouseover`, (data)=> focusRing(data))
             .on(`mouseout`, ()=> focusAllRings());
+    */
     //#endregion ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     //#region generate radar blip legend ++++++++++++++++++++++++++++++++++++++++++++++++

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intia-theme
 version: !ruby/object:Gem::Version
-  version: 0.1.64
+  version: 0.1.65
 platform: ruby
 authors:
 - Marc Schmidt