Overview
| Comment: | changes for webapp |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | pjhatwal1.64 |
| Files: | files | file ages | folders |
| SHA1: |
46824503fa18785f72d8016d9dff1eb6 |
| User & Date: | pjhatwal on 2017-04-04 16:44:33 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-04-05
| ||
| 17:51 | merged with pjhatwal1.64 check-in: 23abe1e5af user: pjhatwal tags: v1.64-envdebug | |
|
2017-04-04
| ||
| 16:44 | changes for webapp Closed-Leaf check-in: 46824503fa user: pjhatwal tags: pjhatwal1.64 | |
|
2017-03-15
| ||
| 17:32 | added flag to allow adding prefix to target check-in: 1fee8d8e98 user: srehman tags: v1.64 | |
Changes
Modified cgisetup/pages/home_ctrl.scm from [cf27e7d669] to [e5b104a203].
| ︙ | ︙ | |||
23 24 25 26 27 28 29 |
;;
(s:set! "row-or-col" (if (list? row-or-col)
(string-intersperse row-or-col ",")
row-or-col))
(s:set! "target-type" target-type)
(s:set! "tfilter" target-filter)
(s:set! "target" target)
| | > > > > > > > > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
;;
(s:set! "row-or-col" (if (list? row-or-col)
(string-intersperse row-or-col ",")
row-or-col))
(s:set! "target-type" target-type)
(s:set! "tfilter" target-filter)
(s:set! "target" target)
(s:set! "target-filter" target-filter)))
((filter2)
(let ((tslice-select (s:get-input 'tslice-select))
(t-slice-filter (s:get-input 't-slice-filter)))
;;
;; s:set! is a page local var. Better than s:session-var-set! but still not a good idea.
;;
(s:set! "tslice" tslice-select)
(s:set! "t-slice-patt" t-slice-filter)))
))
|
Modified cgisetup/pages/home_view.scm from [0d15bde503] to [e0d4892bde].
| ︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE.
;;======================================================================
(define (pages:home session db shared)
(let* ((dbh (s:db))
(ttypes (pgdb:get-target-types dbh))
(selected (string->number (or (s:get "target-type") "0")))
(curr-trec (filter (lambda (x)(eq? selected (vector-ref x 0))) ttypes))
(curr-ttype (if (and selected
(not (null? curr-trec)))
(vector-ref (car curr-trec) 1) #f))
(all-parts (if curr-ttype (append (string-split curr-ttype "/") '("runname" "testname")) '()))
(tfilter (or (s:get "target-filter") "%"))
(targets (pgdb:get-targets-of-type dbh selected tfilter))
| > > > > > > > > > > < < | < | > > > > > > > > | > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | < < < < < < < < < < < < < < < < < < | | < < < | | < | > > > > | > < < | > > | < < | > > > > > > > > > > > > > > > > > > > > > > > | > > | > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 |
;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE.
;;======================================================================
(define (pages:home session db shared)
(let* ((dbh (s:db))
(ttypes (pgdb:get-target-types dbh))
(target-slice (pgdb:get-distict-target-slice dbh))
(selected (string->number (or (s:get "target-type") "0")))
(selected-slice (or (s:get "tslice") ""))
(curr-trec (filter (lambda (x)(eq? selected (vector-ref x 0))) ttypes))
(curr-ttype (if (and selected
(not (null? curr-trec)))
(vector-ref (car curr-trec) 1) #f))
(all-parts (if curr-ttype (append (string-split curr-ttype "/") '("runname" "testname")) '()))
(tfilter (or (s:get "target-filter") "%"))
(tslice-filter (or (s:get "t-slice-patt") ""))
(target-patt (if (or (equal? selected-slice "") (equal? tslice-filter "" ))
""
(conc selected-slice "/" tslice-filter )))
(tab2-data (if (equal? target-patt "")
`()
(pgdb:get-all-run-stats-target-slice dbh target-patt)))
(tab2-ordered-data (pgdb:coalesce-runs-by-slice tab2-data selected-slice))
(targets (pgdb:get-targets-of-type dbh selected tfilter))
(row-or-col (string-split (or (s:get "row-or-col") "") ","))
(all-data (if selected (pgdb:get-latest-run-stats-given-target dbh selected tfilter)
'()))
(ordered-data (pgdb:coalesce-runs dbh all-data all-parts row-or-col 0)))
(s:div 'class "col_12"
(s:ul 'class "tabs left"
(s:li (s:a 'href "#tabr1" "Sliced Filter"))
(s:li (s:a 'href "#tabr2" "Genral Filter")))
(s:div 'id "tabr1" 'class "tab-content"
(s:div 'class "col_11"
(s:fieldset "Filter Targets by slice"
(s:form
'action "home.filter2" 'method "post"
(s:div 'class "col_12"
(s:div 'class "col_6"
(s:select (map (lambda (x)
(let ((t-slice (vector-ref x 0)))
(if (equal? t-slice selected-slice)
(list t-slice t-slice t-slice #t)
(list t-slice t-slice t-slice #f))))
target-slice)
'name 'tslice-select))
(s:div 'class "col_4"
(s:input-preserve 'name "t-slice-filter" 'placeholder "Filter remainder target"))
(s:div 'class "col_2"
(s:input 'type "submit" 'name "set-filter-vals" 'value "Submit")))))
(s:br)
(s:p " Result Format: total / pass / fail / other")
(s:fieldset (conc "Runs data for " target-patt)
(let* ((target-keys (hash-table-keys tab2-ordered-data))
(run-keys (delete-duplicates (apply append (map (lambda (sub-key)
(let ((subdat (hash-table-ref tab2-ordered-data sub-key)))
(hash-table-keys subdat)))
target-keys)))))
(s:table 'class "striped"
(s:tr (s:th 'class "heading" )
(map
(lambda (th-key)
(s:th 'class "heading" th-key ))
run-keys))
(map
(lambda (row-key)
(s:tr (s:td row-key)
(map
(lambda (col-key)
(let ((val (let* ((ht (hash-table-ref/default tab2-ordered-data row-key #f)))
(if ht (hash-table-ref/default ht col-key #f)))))
(if val
(let* ((total (vector-ref val 3))
(pass (vector-ref val 4))
(fail (vector-ref val 5))
(other (vector-ref val 6))
(passper (round (* (/ pass total) 100)))
(target-param (string-substitute "[/]" "_x_" (conc selected-slice "/" row-key) 'all)))
(s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);")
(s:a 'class "white" 'href (s:link-to "run" 'target target-param 'run col-key)
(conc total "/" pass "/" fail "/" other))))
(s:td ""))))
run-keys)))
target-keys))
))
))
(s:div 'id "tabr2" 'class "tab-content"
(s:div 'class "col_11"
(s:fieldset "Area type and target filter"
(s:form
'action "home.filter#tabr2" 'method "post"
(s:div 'class "col_12"
(s:div 'class "col_6"
(s:select (map (lambda (x)
(let ((tt-id (vector-ref x 0))
(ttype (vector-ref x 1)))
(if (eq? tt-id selected)
(list ttype tt-id ttype #t)
(list ttype tt-id ttype #f))))
ttypes)
'name 'target-type))
(s:div 'class "col_4"
(s:input-preserve 'name "tfilter" 'placeholder "Filter targets"))
(s:div 'class "col_2"
(s:input 'type "submit" 'name "set-filter-vals" 'value "Submit")))))
(s:br)
(s:p " Result Format: total / pass / fail / other")
(s:fieldset (conc "Runs data for " tfilter)
;;
;; A very basic display
;;
(let* ((a-keys (sort (hash-table-keys ordered-data) string>=?))
(b-keys (delete-duplicates(sort (apply append (map (lambda (sub-key)
(let ((subdat (hash-table-ref ordered-data sub-key)))
(hash-table-keys subdat)))
a-keys))
string>=?))))
(if #f ;; swap rows/cols
(s:table
(s:tr (s:td "")(map s:tr b-keys))
(map
(lambda (row-key)
(let ((subdat (hash-table-ref ordered-data row-key)))
(s:tr (s:td row-key)
(map
(lambda (col-key)
(s:td (let ((dat (hash-table-ref/default subdat col-key #f)))
(s:td (if dat
(list (vector-ref dat 0)(vector-ref dat 1))
"")))))
b-keys))))
a-keys))
(s:table 'class "striped"
(s:tr (s:th 'class "heading" )
(map
(lambda (th-key)
(s:th 'class "heading" th-key ))
a-keys))
(map
(lambda (row-key)
(s:tr (s:td row-key)
(map
(lambda (col-key)
(let ((val (let* ((ht (hash-table-ref/default ordered-data col-key #f)))
(if ht (hash-table-ref/default ht row-key #f)))))
(if val
(let* ((total (vector-ref val 1))
(pass (vector-ref val 2))
(fail (vector-ref val 3))
(other (vector-ref val 4))
(id (vector-ref val 5))
(passper (round (* (/ pass total) 100)))
(failper (- 100 passper))
(history (pgdb:get-run-stats-history-given-target dbh selected (conc col-key "/" row-key)))
(history-hash (pgdb:get-history-hash history))
(history-keys (sort (hash-table-keys history-hash) string>=?))
(run-key (string-substitute "[/]" "_x_" (conc col-key "/" row-key) 'all)))
(s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);")
(s:a 'class "white" 'href (s:link-to "run" 'target run-key)
(conc "Latest:" total "/" pass "/" fail "/" other)) (s:span " | ") (s:a 'id id 'class "viewmodal" 'title "Click to see description" "History") (s:br)
(s:div 'id (conc "myModal" id) 'class "modal"
(s:div 'class "modal-content"
(s:span 'id id 'class "close" "×")
;(s:p (conc "Modal " id ".."))
(s:div
(s:table
(s:tr
(s:th "Runame")
(s:th "Result")
)
(map
(lambda (history-key)
(let* ((history-row (hash-table-ref/default history-hash history-key #f))
(htotal (vector-ref history-row 1))
(hpass (vector-ref history-row 2))
(hfail (vector-ref history-row 3))
(hother (vector-ref history-row 4))
(passper (round (* (/ hpass htotal) 100))))
(s:tr (s:td history-key)
(s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);")
(conc htotal "/" hpass "/" hfail "/" hother )))))
history-keys)))
))
))
(s:td ""))))
a-keys)))
b-keys)))))))
)))
|
Modified cgisetup/pages/index_ctrl.scm from [2db5974e1a] to [afbe8a90ae].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 |
#<<EOF
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta name="description" content="" />
<link rel="stylesheet" type="text/css" href="/css/kickstart.css" media="all" /> <!-- KICKSTART -->
<link rel="stylesheet" type="text/css" href="/style.css" media="all" /> <!-- CUSTOM STYLES -->
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<style type="text/css">
.column {
/* border:1px solid red; */
padding:0px;
}
</style>
EOF
)
(define index:jquery
(if #t
| > > > > > > > > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
#<<EOF
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta name="description" content="" />
<link rel="stylesheet" type="text/css" href="/css/kickstart.css" media="all" /> <!-- KICKSTART -->
<link rel="stylesheet" type="text/css" href="/style.css" media="all" /> <!-- CUSTOM STYLES -->
<link rel="stylesheet" type="text/css" href="/css/pjhatwal-modal.css" media="all" /> <!-- Modal -->
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<style type="text/css">
.column {
/* border:1px solid red; */
padding:0px;
}
a.white{
color:white;
}
th.heading{
text-align:-webkit-center;
background:rgba(0, 0, 0, 0.21);
}
</style>
EOF
)
(define index:jquery
(if #t
|
| ︙ | ︙ | |||
54 55 56 57 58 59 60 61 62 63 | EOF )) (define index:javascript #<<EOF <script type="text/javascript" src="/js/prettify.js"></script> <!-- PRETTIFY --> <script type="text/javascript" src="/js/kickstart.js"></script> <!-- KICKSTART --> EOF ) | > | 62 63 64 65 66 67 68 69 70 71 72 | EOF )) (define index:javascript #<<EOF <script type="text/javascript" src="/js/prettify.js"></script> <!-- PRETTIFY --> <script type="text/javascript" src="/js/kickstart.js"></script> <!-- KICKSTART --> <script type="text/javascript" src="/js/pjhatwal-modal.js "></script> <!-- Modal --> EOF ) |
Modified cgisetup/pages/run_view.scm from [8edac034a0] to [7ccbd2143e].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 |
(target-param (s:get-param 'target))
(target1 (if (s:get "target")
(s:get "target")
(s:get-param 'target)))
(target (if (equal? target1 #f)
"%"
(string-substitute "_x_" "/" target1 'all)
| | > | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
(target-param (s:get-param 'target))
(target1 (if (s:get "target")
(s:get "target")
(s:get-param 'target)))
(target (if (equal? target1 #f)
"%"
(string-substitute "_x_" "/" target1 'all)
))
(run-filter (or (or (s:get "run-name-filter") (s:get-param 'run)) "%"))
(runs (pgdb:get-runs-by-target dbh target run-filter))
(ordered-runs (pgdb:runs-to-hash runs)))
(s:div 'class "col_12"
(s:fieldset
"Run filter"
(s:form
|
| ︙ | ︙ | |||
62 63 64 65 66 67 68 |
(if val
(let* ((result (vector-ref val 2))
(test-id (vector-ref val 4))
(bg (if (equal? result "PASS")
"green"
"red")))
(s:td 'style (conc "background: " bg )
| | | 63 64 65 66 67 68 69 70 71 72 73 74 75 |
(if val
(let* ((result (vector-ref val 2))
(test-id (vector-ref val 4))
(bg (if (equal? result "PASS")
"green"
"red")))
(s:td 'style (conc "background: " bg )
(s:a 'class "white" 'href (s:link-to "log" 'testid test-id)
result)))
(s:td ""))))
a-keys)))
b-keys)))))))
|
tests/fullrun/tests/exit_0/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/exit_1/main.sh became executable with contents [c5651ffc6c].
| ︙ | ︙ |
tests/fullrun/tests/lineitem_fail/main.sh became executable with contents [b8aaccbe35].
| ︙ | ︙ |
tests/fullrun/tests/lineitem_pass/main.sh became executable with contents [c43fd19ef0].
| ︙ | ︙ |
tests/fullrun/tests/priority_1/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_10/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_2/main.sh became executable with contents [8c8c341150].
| ︙ | ︙ |
tests/fullrun/tests/priority_3/main.sh became executable with contents [416f9ddbf9].
| ︙ | ︙ |
tests/fullrun/tests/priority_4/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_5/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_6/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_7/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/priority_8/main.sh became executable with contents [12267f0508].
| ︙ | ︙ |
tests/fullrun/tests/priority_9/main.sh became executable with contents [0536bc3eb1].
| ︙ | ︙ |
tests/fullrun/tests/singletest/main.sh became executable with contents [d41b458021].
| ︙ | ︙ |