Configure the number of columns (#110)

* start work on grid learning * ability to configure number of columns
bellrichm · Jul 26, 2023 · aad51fe · aad51fe
1 parent e013233
commit aad51fe
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 13 deletions.
diff --git a/bin/user/jas.py b/bin/user/jas.py
@@ -173,7 +173,7 @@ def logerr(msg):
         logmsg(syslog.LOG_ERR, msg)
 
 
-VERSION = "0.4.1-rc01b"
+VERSION = "0.4.1-rc01c"
 
 class JAS(SearchList):
     """ Implement tags used by templates in the skin. """

diff --git a/install.py b/install.py
@@ -12,7 +12,7 @@
 import configobj
 from weecfg.extension import ExtensionInstaller
 
-VERSION = "0.4.1-rc01b"
+VERSION = "0.4.1-rc01c"
 
 EXTENSION_CONFIG = """
 [StdReport]

diff --git a/skins/jas/generators/body.inc b/skins/jas/generators/body.inc
@@ -27,15 +27,15 @@
           <div class="row">
         #end if
       #end if
+      #set global section_global = $section
       #if $section in $charts
-        #set global section_global = $section
         #include 'sections/chart.inc'
-        #set global section_global = None
       #else if $include_name is not None
         #include $include_name
       #else
         #include 'sections/' + $section + '.inc'
       #end if
+      #set global section_global = None
       #if $layout != 'grid'
         </div>
       #end if

diff --git a/skins/jas/sections/chart.inc b/skins/jas/sections/chart.inc
@@ -2,7 +2,10 @@
 ##    See the file LICENSE.txt for your rights.
 
 #set id = $section_global + $page_name_global
-<div class="col-12 col-xl-6 mb-4">
+#set grid_cols = $getVar('$Extras.pages.' + $page + '.' + $section_global + '.grid_cols', 
+                            $getVar('$Extras.pages.' + $page + '.grid_cols',
+                                $getVar('$Extras.grid_cols')))
+<div class="$grid_cols">
     <div class="card">
     <div class="card-body text-center">
         #set text_label = False

diff --git a/skins/jas/sections/current.inc b/skins/jas/sections/current.inc
@@ -1,7 +1,10 @@
-##    Copyright (c) 2021-2022 Rich Bell <bellrichm@gmail.com>
+##    Copyright (c) 2021-2023 Rich Bell <bellrichm@gmail.com>
 ##    See the file LICENSE.txt for your rights.
 
-<div class="col-12 col-xl-6 mb-4">
+#set grid_cols = $getVar('$Extras.pages.' + $page + '.' + $section_global + '.grid_cols', 
+                            $getVar('$Extras.pages.' + $page + '.grid_cols',
+                                $getVar('$Extras.grid_cols')))
+<div class="$grid_cols">
     <div class="card">
         <div class="card-body text-center">
             #if $getVar('$Extras.current.observation', False)

diff --git a/skins/jas/sections/minmax.inc b/skins/jas/sections/minmax.inc
@@ -1,7 +1,10 @@
-##    Copyright (c) 2021 Rich Bell <bellrichm@gmail.com>
+##    Copyright (c) 2021-2023 Rich Bell <bellrichm@gmail.com>
 ##    See the file LICENSE.txt for your rights.
 
-<div class="col-12 col-xl-6 mb-4">
+#set grid_cols = $getVar('$Extras.pages.' + $page + '.' + $section_global + '.grid_cols', 
+                            $getVar('$Extras.pages.' + $page + '.grid_cols',
+                                $getVar('$Extras.grid_cols')))
+<div class="$grid_cols">
     <div class="card">
         <div class="card-body text-center">
                 <h5 class="card-title"  text_label="minmax_title"></h5>

diff --git a/skins/jas/sections/radar.inc b/skins/jas/sections/radar.inc
@@ -1,7 +1,10 @@
-##    Copyright (c) 2021 Rich Bell <bellrichm@gmail.com>
+##    Copyright (c) 2021-2023 Rich Bell <bellrichm@gmail.com>
 ##    See the file LICENSE.txt for your rights.
 
-          <div class="col-12 col-xl-6 mb-4">
+#set grid_cols = $getVar('$Extras.pages.' + $page + '.' + $section_global + '.grid_cols', 
+                            $getVar('$Extras.pages.' + $page + '.grid_cols',
+                                $getVar('$Extras.grid_cols')))
+          <div class="$grid_cols">
             <div class="card">
               <div class="card-body text-center">
                 <h5 class="card-title"  text_label="radar_title"></h5>

diff --git a/skins/jas/sections/thisdate.inc b/skins/jas/sections/thisdate.inc
@@ -1,7 +1,10 @@
-##    Copyright (c) 2021-2022 Rich Bell <bellrichm@gmail.com>
+##    Copyright (c) 2021-2023 Rich Bell <bellrichm@gmail.com>
 ##    See the file LICENSE.txt for your rights.
 
-<div class="col-12 col-xl-6 mb-4">
+#set grid_cols = $getVar('$Extras.pages.' + $page + '.' + $section_global + '.grid_cols', 
+                            $getVar('$Extras.pages.' + $page + '.grid_cols',
+                                $getVar('$Extras.grid_cols')))
+<div class="$grid_cols">
     <div class="card">
         <div class="card-body text-center">
                 <h5 class="card-title"  text_label="thisdate_title"></h5>

diff --git a/skins/jas/skin.conf b/skins/jas/skin.conf
@@ -15,6 +15,7 @@ SKIN_VERSION = 0.3.2-rc01a
     echarts_version = 5.3.3
 
     navbar_collapse = 768
+    grid_cols = "col-12 col-xl-6 mb-4"
 
     [[mqtt]]
         enable = false