Overview
Comment: | Fixed few issues in user dashboard views. Minor refactor in pgdb.scm |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.64-envdebug |
Files: | files | file ages | folders |
SHA1: |
ce51b1039ecaf62381ca5c2902ec722e |
User & Date: | matt on 2017-04-05 04:50:46 |
Other Links: | branch diff | manifest | tags |
Context
2017-04-05
| ||
05:26 | Fixed run command for mtutil check-in: 3c313e0476 user: matt tags: v1.64-envdebug | |
04:50 | Fixed few issues in user dashboard views. Minor refactor in pgdb.scm check-in: ce51b1039e user: matt tags: v1.64-envdebug | |
04:49 | Added example of generating targets for mtutil check-in: 31b1345d05 user: matt tags: v1.64-envdebug | |
Changes
Modified cgisetup/models/pgdb.scm from [c93d09ef82] to [d47a56499d].
︙ | ︙ | |||
23 24 25 26 27 28 29 | ;; (import data-structures) ;; (import chicken) (use typed-records (prefix dbi dbi:)) ;; given a configdat lookup the connection info and open the db ;; | | > > > | > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | ;; (import data-structures) ;; (import chicken) (use typed-records (prefix dbi dbi:)) ;; given a configdat lookup the connection info and open the db ;; (define (pgdb:open configdat #!key (dbname #f)(dbispec #f)) (let ((pgconf (or dbispec (args:get-arg "-pgsync") (if configdat (configf:lookup configdat "ext-sync" (or dbname "pgdb")) #f) ))) (if pgconf (let* ((confdat (map (lambda (conf-item) (let ((parts (string-split conf-item ":"))) (if (> (length parts) 1) (let ((key (car parts)) (val (cadr parts))) (cons (string->symbol key) val)) |
︙ | ︙ | |||
250 251 252 253 254 255 256 257 258 259 260 261 262 263 | (coldat (hash-table-ref/default data first #f))) (if (not coldat)(let ((newht (make-hash-table))) (hash-table-set! data first newht) (set! coldat newht))) (hash-table-set! coldat rest run))) runs) data)) (define (pgdb:runs-to-hash runs ) (let* ((data (make-hash-table))) (for-each (lambda (run) (let* ((run-name (vector-ref run 0)) (test (conc (vector-ref run 1) ":" (vector-ref run 3))) | > > > > > > > > > > > > > > > > > | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 | (coldat (hash-table-ref/default data first #f))) (if (not coldat)(let ((newht (make-hash-table))) (hash-table-set! data first newht) (set! coldat newht))) (hash-table-set! coldat rest run))) runs) data)) ;; given ordered data hash return a-keys ;; (define (pgdb:ordered-data->a-keys ordered-data) (sort (hash-table-keys ordered-data) string>=?)) ;; given ordered data hash return b-keys ;; (define (pgdb:ordered-data->b-keys ordered-data a-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>=?))) (define (pgdb:runs-to-hash runs ) (let* ((data (make-hash-table))) (for-each (lambda (run) (let* ((run-name (vector-ref run 0)) (test (conc (vector-ref run 1) ":" (vector-ref run 3))) |
︙ | ︙ |
Modified cgisetup/pages/home_view.scm from [8cd8eab562] to [cf60cb921f].
︙ | ︙ | |||
72 73 74 75 76 77 78 | (s:p " Result Format: total / pass / fail / other") (s:fieldset (conc "Runs data for " tfilter) ;; ;; A very basic display ;; | | < < < | < < < | | | | 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 | (s:p " Result Format: total / pass / fail / other") (s:fieldset (conc "Runs data for " tfilter) ;; ;; A very basic display ;; (let* ((a-keys (pgdb:ordered-data->a-keys ordered-data)) (b-keys (pgdb:ordered-data->b-keys ordered-data a-keys))) ;; (c-keys (delete-duplicates b-keys))) (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 (s:tr (s:td "")(map s:td a-keys)) (map (lambda (row-key) (s:tr (s:td row-key) (map (lambda (col-key) |
︙ | ︙ |
Modified dashboard.scm from [3452a7b11d] to [a14a45cd51].
︙ | ︙ | |||
148 149 150 151 152 153 154 | updating: #f hide-not-hide-tabs: #f )) ;; RA => returns the tabdat stored at hashkey passed in commondat-tabdats table (e.g. 0 gives summary) ;; (define (dboard:common-get-tabdat commondat #!key (tab-num #f)) | | | | > > > > > | | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | updating: #f hide-not-hide-tabs: #f )) ;; RA => returns the tabdat stored at hashkey passed in commondat-tabdats table (e.g. 0 gives summary) ;; (define (dboard:common-get-tabdat commondat #!key (tab-num #f)) (let* ((tnum (or tab-num (dboard:commondat-curr-tab-num commondat) 0)) ;; tab-num value is curr-tab-num value in passed commondat (ht (dboard:commondat-tabdats commondat)) (res (hash-table-ref/default ht tnum #f))) (or res (let ((new-tabdat (dboard:tabdat-make-data))) (hash-table-set! ht tnum new-tabdat) new-tabdat)))) ;; RA => sets the tabdat passed to the hashkey at commondat:tabdats hash table ;; (define (dboard:common-set-tabdat! commondat tabnum tabdat) (hash-table-set! (dboard:commondat-tabdats commondat) tabnum |
︙ | ︙ | |||
1932 1933 1934 1935 1936 1937 1938 | (lambda () (handle-exceptions exn (begin (print-call-chain) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) (debug:print 0 *default-log-port* "ERROR: failed call procedure \"" updater | | | | | | | 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 | (lambda () (handle-exceptions exn (begin (print-call-chain) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) (debug:print 0 *default-log-port* "ERROR: failed call procedure \"" updater "\", with; tabnum=" tab-num ", view-name=" view-name ", and views-cfgdat and megatest configdat as parameters. To debug try loading in the repl: megatest -repl") (set! success #f)) (debug:print 4 *default-log-port* "Running updater for tab " view-name " with proc " updater " and tab-num: " tab-num) ((eval (string->symbol updater)) commondat tabs tab-num view-name views-cfgdat *configdat*))) tab-num: tab-num)) ;;(if success ;; (begin ;; ;; (iup:attribute-set! tabs (conc "TABTITLE" tab-num) view-name) ;; (dboard:common-set-tabdat! commondat tab-num (dboard:tabdat-make-data)))) result-child)) (define (dboard:runs-summary-buttons-updater tabdat) (let loop ((buttons-left (dboard:tabdat-runs-summary-mode-buttons tabdat)) (modes-left (dboard:tabdat-runs-summary-modes tabdat))) |
︙ | ︙ |