Showing
3 changed files
with
100 additions
and
10 deletions
... | @@ -178,12 +178,18 @@ function appLoad(id, args) { | ... | @@ -178,12 +178,18 @@ function appLoad(id, args) { |
178 | appInsertLoadingIndicator(e); | 178 | appInsertLoadingIndicator(e); |
179 | // TODO: Error handling may not work yet | 179 | // TODO: Error handling may not work yet |
180 | e.load(uispinServlet, url, function() { | 180 | e.load(uispinServlet, url, function() { |
181 | + appLoadPostProcessAll(e); | ||
182 | + }); | ||
183 | +} | ||
184 | + | ||
185 | + | ||
186 | +// Private | ||
187 | +function appLoadPostProcessAll(e) { | ||
181 | appLoadPostProcess(e, 'north'); | 188 | appLoadPostProcess(e, 'north'); |
182 | appLoadPostProcess(e, 'east'); | 189 | appLoadPostProcess(e, 'east'); |
183 | appLoadPostProcess(e, 'south'); | 190 | appLoadPostProcess(e, 'south'); |
184 | appLoadPostProcess(e, 'west'); | 191 | appLoadPostProcess(e, 'west'); |
185 | appLoadPostProcess(e, 'center'); | 192 | appLoadPostProcess(e, 'center'); |
186 | - }); | ||
187 | } | 193 | } |
188 | 194 | ||
189 | 195 | ||
... | @@ -255,7 +261,19 @@ function appLoadSearchResultsGrid(formId, targetId, onSelect) { | ... | @@ -255,7 +261,19 @@ function appLoadSearchResultsGrid(formId, targetId, onSelect) { |
255 | $.get(uispinServlet + '?_viewClass=app:SearchResultsGrid&_snippet=true&' + | 261 | $.get(uispinServlet + '?_viewClass=app:SearchResultsGrid&_snippet=true&' + |
256 | params + escaped, function(data) { | 262 | params + escaped, function(data) { |
257 | $('#' + targetId).html(data); | 263 | $('#' + targetId).html(data); |
264 | + appLoadPostProcessAll($('#' + targetId).parent()); | ||
265 | + }); | ||
266 | +} | ||
267 | + | ||
268 | + | ||
269 | +function appResizeGrid(pane, $Pane, paneState) { | ||
270 | + /* | ||
271 | + if(grid = $('.ui-jqgrid')) { //}-btable:visible')) { | ||
272 | + grid.each(function(index) { | ||
273 | + var gridId = $(this).attr('id'); | ||
274 | + $('#' + gridId).setGridWidth(paneState.innerWidth - 2); | ||
258 | }); | 275 | }); |
276 | + }*/ | ||
259 | } | 277 | } |
260 | 278 | ||
261 | 279 | ... | ... |
... | @@ -54,15 +54,13 @@ | ... | @@ -54,15 +54,13 @@ |
54 | {= ?onSelect } | 54 | {= ?onSelect } |
55 | }, | 55 | }, |
56 | </ui:if> | 56 | </ui:if> |
57 | - autoWidth: true, | 57 | + autowidth: true, |
58 | - height: '100%', | 58 | + height: 'auto', |
59 | rowNum: 10, | 59 | rowNum: 10, |
60 | rowList:[5,10,20], | 60 | rowList:[5,10,20], |
61 | pager: '#{= ?pagerId }', | 61 | pager: '#{= ?pagerId }', |
62 | - shrinkToFit: false, | ||
63 | sortorder: 'asc', | 62 | sortorder: 'asc', |
64 | viewrecords: true | 63 | viewrecords: true |
65 | - //width: '100%' | ||
66 | }).jqGrid('navGrid', '#{= ?pagerId }', { | 64 | }).jqGrid('navGrid', '#{= ?pagerId }', { |
67 | add:false, | 65 | add:false, |
68 | del:false, | 66 | del:false, |
... | @@ -70,8 +68,5 @@ | ... | @@ -70,8 +68,5 @@ |
70 | search: false | 68 | search: false |
71 | }); | 69 | }); |
72 | 70 | ||
73 | - $("#{= ?tableId }").parent().resize(function() { | ||
74 | - alert('Resized'); | ||
75 | - }); | ||
76 | </script> | 71 | </script> |
77 | </ui:group> | 72 | </ui:group> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -232,8 +232,8 @@ log:LogEventFormBody | ... | @@ -232,8 +232,8 @@ log:LogEventFormBody |
232 | ] ; | 232 | ] ; |
233 | ui:child | 233 | ui:child |
234 | [ rdf:type app:ColumnLayout ; | 234 | [ rdf:type app:ColumnLayout ; |
235 | - arg:colWidths "66%,34%"^^xsd:string ; | 235 | + arg:colWidths "50%,50%"^^xsd:string ; |
236 | - arg:width "500px"^^xsd:string ; | 236 | + arg:width "600px"^^xsd:string ; |
237 | ui:child | 237 | ui:child |
238 | [ rdf:type app:Object ; | 238 | [ rdf:type app:Object ; |
239 | arg:label "Created"^^xsd:string ; | 239 | arg:label "Created"^^xsd:string ; |
... | @@ -274,6 +274,83 @@ log:LogEventFormBody | ... | @@ -274,6 +274,83 @@ log:LogEventFormBody |
274 | ] | 274 | ] |
275 | ] . | 275 | ] . |
276 | 276 | ||
277 | +log:ReportDownloadEvent | ||
278 | + app:keyProperties (<http://purl.org/dc/terms/created> rdf:type log:reportType log:ownerId log:initiatedBy log:onBehalfOf log:outcome rdfs:comment) ; | ||
279 | + ui:instanceView | ||
280 | + [ rdf:type ui:group ; | ||
281 | + default:subject spin:_this ; | ||
282 | + ui:child | ||
283 | + [ rdf:type log:LogEventFormBody ; | ||
284 | + arg:resource spin:_this ; | ||
285 | + ui:childIndex 0 | ||
286 | + ] ; | ||
287 | + ui:child | ||
288 | + [ rdf:type app:ColumnLayout ; | ||
289 | + arg:colWidths "50%,50%"^^xsd:string ; | ||
290 | + arg:width "600px"^^xsd:string ; | ||
291 | + ui:child | ||
292 | + [ rdf:type app:Object ; | ||
293 | + arg:label "Report type"^^xsd:string ; | ||
294 | + arg:predicate log:reportType ; | ||
295 | + ui:childIndex 0 | ||
296 | + ] ; | ||
297 | + ui:child | ||
298 | + [ rdf:type app:Object ; | ||
299 | + arg:label "Licence/BAA id"^^xsd:string ; | ||
300 | + arg:predicate log:ownerId ; | ||
301 | + ui:childIndex 1 | ||
302 | + ] ; | ||
303 | + ui:childIndex 1 | ||
304 | + ] | ||
305 | + ] . | ||
306 | + | ||
307 | +log:ReportEvent | ||
308 | + app:keyProperties (<http://purl.org/dc/terms/created> rdf:type log:reportType log:initiatedBy log:onBehalfOf log:outcome rdfs:comment) ; | ||
309 | + ui:instanceView | ||
310 | + [ rdf:type ui:group ; | ||
311 | + ui:child | ||
312 | + [ rdf:type log:LogEventFormBody ; | ||
313 | + arg:resource spin:_this ; | ||
314 | + ui:childIndex 0 | ||
315 | + ] ; | ||
316 | + ui:child | ||
317 | + [ rdf:type app:Object ; | ||
318 | + arg:label "Report type"^^xsd:string ; | ||
319 | + arg:predicate log:reportType ; | ||
320 | + ui:childIndex 1 | ||
321 | + ] | ||
322 | + ] . | ||
323 | + | ||
324 | +log:ReportUploadEvent | ||
325 | + app:keyProperties (<http://purl.org/dc/terms/created> rdf:type log:reportType log:wellBoreName log:initiatedBy log:onBehalfOf log:outcome rdfs:comment) ; | ||
326 | + ui:instanceView | ||
327 | + [ rdf:type ui:group ; | ||
328 | + default:subject spin:_this ; | ||
329 | + ui:child | ||
330 | + [ rdf:type log:LogEventFormBody ; | ||
331 | + arg:resource spin:_this ; | ||
332 | + ui:childIndex 0 | ||
333 | + ] ; | ||
334 | + ui:child | ||
335 | + [ rdf:type app:ColumnLayout ; | ||
336 | + arg:colWidths "50%,50%"^^xsd:string ; | ||
337 | + arg:width "600px"^^xsd:string ; | ||
338 | + ui:child | ||
339 | + [ rdf:type app:Object ; | ||
340 | + arg:label "Report type"^^xsd:string ; | ||
341 | + arg:predicate log:reportType ; | ||
342 | + ui:childIndex 0 | ||
343 | + ] ; | ||
344 | + ui:child | ||
345 | + [ rdf:type app:Object ; | ||
346 | + arg:label "Well bore name"^^xsd:string ; | ||
347 | + arg:predicate log:wellBoreName ; | ||
348 | + ui:childIndex 1 | ||
349 | + ] ; | ||
350 | + ui:childIndex 1 | ||
351 | + ] | ||
352 | + ] . | ||
353 | + | ||
277 | <http://www.reportinghub.no/system/swp/SWP-logging> | 354 | <http://www.reportinghub.no/system/swp/SWP-logging> |
278 | rdf:type owl:Ontology ; | 355 | rdf:type owl:Ontology ; |
279 | owl:imports <http://appschema.org> , <http://www.reportinghub.no/system/schema/logging> ; | 356 | owl:imports <http://appschema.org> , <http://www.reportinghub.no/system/schema/logging> ; | ... | ... |
-
Please register or login to post a comment