add new pngs, fix echarts show bugs

hautof · Apr 19, 2019 · 0b51558 · 0b51558
1 parent e8ab393
commit 0b51558
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 3 deletions.
diff --git a/doc/default.png b/doc/default.png
diff --git a/doc/index.png b/doc/index.png
diff --git a/doc/main.png b/doc/main.png
diff --git a/doc/test.png b/doc/test.png
diff --git a/doc/today.png b/doc/today.png
diff --git a/hafweb/config.py b/hafweb/config.py
@@ -9,6 +9,6 @@
 
 MAIN_VERSION = 0
 SUB_VERSION = 1
-FIX_VERSION = 7
+FIX_VERSION = 8
 
 VERSION = f"{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}"
diff --git a/hafweb/resource/index.html b/hafweb/resource/index.html
@@ -44,6 +44,12 @@ <h2> HTML URLS </h2>
           <td><a href="/index">/index</a></td>
           <td>show all test results</td>
          </tr>
+         <tr>
+          <td>4</td>
+          <td>/today</td>
+          <td><a href="/today">/today</a></td>
+          <td>get haf's all tests of today</td>
+         </tr>
          <tr>
           <td>3</td>
           <td>/test?test_id=1</td>

diff --git a/hafweb/resource/today.html b/hafweb/resource/today.html
@@ -161,7 +161,7 @@
             <div class="jumbotron well" style="text-aligin:center">
                     <ul>
                         <li> <a></a>
-                            <div id="echart-map" style="height:800px;width:100%">
+                            <div id="echart-map" style="height:{{all_count*70}}px;width:100%">
                                 <script type="text/javascript">
                                 var width = $("width_for_echart").width();
                                 var myChart = echarts.init(document.getElementById('echart-map'));

diff --git a/hafweb/view/view_main.py b/hafweb/view/view_main.py
@@ -65,16 +65,18 @@ def g_main_today(cls, test_filter) -> str:
         main_today = Controller.get_main_today()
         main_all = {"passed": 0, "failed": 0, "error": 0, "skip": 0, "all": 0}
         mains = ViewMain.split_main(main_today, test_filter)
+        all_count = 0
         for key in mains.keys():
             tests = mains.get(key)
             for mkey in tests.keys():
+                all_count += 1
                 m = tests.get(mkey)
                 main_all["passed"] += m.passed
                 main_all["failed"] += m.failed
                 main_all["error"] += m.error
                 main_all["skip"] += m.skip
         main_all["all"] = main_all["passed"] + main_all["failed"] + main_all["error"] + main_all["skip"]
-        return index.render(today=datetime.today().date(),main=main_today, all=main_all, hafversion=PLATFORM_VERSION, testname="TODAY", mains=mains)
+        return index.render(today=datetime.today().date(),main=main_today, all=main_all, hafversion=PLATFORM_VERSION, testname="TODAY", mains=mains, all_count=all_count)
 
     @classmethod
     def g_test(cls, test_id: int) -> str: