Changes between Version 78 and Version 79 of Event/GHC2014
- Timestamp:
- 10/07/14 10:15:35 (10 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Event/GHC2014
v78 v79 88 88 === !SituationReport (!SitRep) Aggregation === 89 89 90 We currently have a very basic !SitRep module in Eden where we can write a Rich Text report &/or add a file attachment. There are cases where the !SitReps for different Districts should be aggregated at the next higher level (e.g. Province or Division). 90 We currently have a very basic !SitRep module in Eden where we can write a Rich Text report &/or add a file attachment. 91 92 There are cases where the !SitReps for different Districts should be aggregated at the next higher level (e.g. Province or Division). 91 93 92 94 For the Rich-Text, I see this as creating a section for each District with a Section Header added and all the Heading levels taken down a notch: H1s -> H2s, etc 93 95 94 SitReps can also include hard numbers though, like #affected, #dead, #wounded, #missing, #displaced, # staff, #volunteers, # vehicles, #shelters, etc then obviously these should be totalled in the aggregated report.96 !SitReps can also include hard numbers though, like #affected, #dead, #wounded, #missing, #displaced, # staff, #volunteers, # vehicles, #shelters, etc then obviously these should be totalled in the aggregated report. 95 97 96 So, we need a way to store these in the !SitRep: I would suggest a Key-Value system: doc_sitrep_tag. 98 So, we need a way to store these in the !SitRep. I would suggest a Key-Value system: 99 * {{{doc_sitrep_tag}}} 97 100 98 This would be like the ones for gis_location (amongst others): https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L1254 99 Note how these are added to the parent resource as a 'Component': https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L386 101 This would be like the ones for {{{gis_location}}} (amongst others): 102 * https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L1254 103 Note how these are added to the parent resource as a [wiki:S3/S3Model/ComponentResources Component]: 104 * https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L386 100 105 101 This model should be added to the !SitRep class (I don't think we need a separate class here): https://github.com/flavour/eden/blob/master/modules/s3db/doc.py#L664 106 This model should be added to the !SitRep class (I don't think we need a separate class here): 107 * https://github.com/flavour/eden/blob/master/modules/s3db/doc.py#L664 102 108 103 For UI, this could be a Tab, as it is for gis_location, or could be an Inline form. I think the Inline form is better, generally better UX & works better for when the sitrep is itself on a tab (e.g. of the Event or Org)104 Inline form: https://github.com/flavour/eden/blob/master/modules/s3db/doc.py#L715 (Can add KV like Files)105 109 106 Tabs: https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L5427 (Need to add an rheader like this to !SitReps)110 For UI, this could be a Tab, as it is for {{{gis_location}}}, or could be an Inline form. I think the Inline form is better, generally better UX & works better for when the sitrep is itself on a tab (e.g. of the Event or Org) 107 111 108 Ideally XSLT would be provided to import the Tags: https://github.com/flavour/eden/blob/master/static/formats/s3csv/event/event.xsl 109 [Example of a KV in an XSLT file] https://github.com/flavour/eden/blob/master/static/formats/s3csv/doc/sitrep.xsl 110 [File which needs modifying] 112 Inline form: 113 * https://github.com/flavour/eden/blob/master/modules/s3db/doc.py#L715 (Can add KV like Files) 111 114 112 I have provided an initial UI for the aggregation: https://github.com/flavour/eden/blob/master/private/templates/ARC/config.py#L841 i.e. there is a hook for a new 'consolidate' method which is called 113 with the selected sitreps. The consolidate method needs writing. It would look something like this: https://github.com/flavour/eden/blob/master/modules/s3db/hrm.py#L3995 115 Tabs: 116 * https://github.com/flavour/eden/blob/master/modules/s3db/gis.py#L5427 (Need to add an rheader like this to !SitReps) 117 118 119 Ideally XSLT would be provided to import the Tags: 120 * https://github.com/flavour/eden/blob/master/static/formats/s3csv/event/event.xsl [Example of a KV in an XSLT file] 121 * https://github.com/flavour/eden/blob/master/static/formats/s3csv/doc/sitrep.xsl [File which needs modifying] 122 123 124 I have provided an initial UI for the aggregation: 125 * https://github.com/flavour/eden/blob/master/private/templates/ARC/config.py#L841 126 i.e. there is a hook for a new 'consolidate' method which is called with the selected sitreps. 127 128 The {{{consolidate}}} method needs writing. It would look something like this: 129 * https://github.com/flavour/eden/blob/master/modules/s3db/hrm.py#L3995 114 130 115 131 === Budget ===