From a406d12e4184d7f3cd46944dbb76974f5ed509d8 Mon Sep 17 00:00:00 2001
From: Mark Unwin <marku@opmantek.com>
Date: Mon, 29 Jan 2018 08:48:03 +1000
Subject: [PATCH] Fix data_order for nmis exporrt. Add an opmantek details SVG
 for menu display.

---
 .../application/helpers/output_helper.php     |   3 +
 www/open-audit/icons/opmantek_details.svg     | 160 ++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 www/open-audit/icons/opmantek_details.svg

diff --git a/code_igniter/application/helpers/output_helper.php b/code_igniter/application/helpers/output_helper.php
index 3bb255ee6..a1a10baca 100644
--- a/code_igniter/application/helpers/output_helper.php
+++ b/code_igniter/application/helpers/output_helper.php
@@ -84,6 +84,9 @@ function output()
             # Do nothing
         } else if ($CI->response->meta->collection == 'nmis') {
             # Do nothing
+            if (empty($CI->response->meta->data_order)) {
+                $CI->response->meta->data_order = array();
+            }
         } else {
 
             if (!empty($CI->response->data)) {
diff --git a/www/open-audit/icons/opmantek_details.svg b/www/open-audit/icons/opmantek_details.svg
new file mode 100644
index 000000000..468b9ab7c
--- /dev/null
+++ b/www/open-audit/icons/opmantek_details.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="475.55875"
+   height="323.2045"
+   id="svg3430"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 475.55875 323.2045"
+   sodipodi:docname="nmis.svg">
+  <defs
+     id="defs3432" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#ffffff"
+     borderopacity="0.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="0.35"
+     inkscape:cx="-57.934901"
+     inkscape:cy="147.31653"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1170"
+     inkscape:window-height="565"
+     inkscape:window-x="305"
+     inkscape:window-y="498"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata3435">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(554.92224,-356.47422)">
+    <g
+       id="g20"
+       transform="matrix(1.25,0,0,-1.25,-95.438485,561.91622)">
+      <path
+         d="m 0,0 0,-37.671 c 0,-31.215 -79.446,-56.539 -177.396,-56.539 -97.943,0 -177.389,25.324 -177.389,56.539 l 0,37.671 c 0,4.37 1.564,8.606 4.51,12.695 3.269,-4.684 6.935,-9.07 10.965,-13.092 1.184,-1.175 2.4,-2.317 3.642,-3.443 2.946,-27.045 72.693,-48.693 158.272,-48.693 85.511,0 155.233,21.615 158.279,48.627 1.266,1.142 2.491,2.301 3.699,3.509 4.014,4.022 7.696,8.375 10.957,13.043 C -1.54,8.574 0,4.354 0,0"
+         style="fill:#6f7073;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path22"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g24"
+       transform="matrix(1.25,0,0,-1.25,-199.97099,367.23172)">
+      <path
+         d="m 0,0 0,-0.017 -0.033,0 -0.058,0 0,0.017 C -24.347,0 -46.302,-9.832 -62.199,-25.721 -78.097,-41.61 -87.929,-63.59 -87.937,-87.854 l 0.025,0 0,-0.033 0,-0.05 -0.025,0 c 0.017,-24.264 9.848,-46.228 25.738,-62.117 15.897,-15.905 37.861,-25.737 62.141,-25.737 l 0,0.017 0.025,0 0.066,0 0,-0.017 c 24.265,0.017 46.22,9.832 62.117,25.737 15.898,15.889 25.729,37.853 25.729,62.134 l -0.008,0 0,0.033 0,0.066 0.008,0 c -0.008,24.247 -9.831,46.195 -25.712,62.084 l -0.017,0 C 46.261,-9.832 24.281,0 0,0 M -0.033,8.606 0,8.606 0,8.59 C 26.647,8.574 50.771,-2.201 68.217,-19.663 l 0.015,0 0.009,0 c 17.429,-17.445 28.212,-41.544 28.22,-68.158 l 0.025,0 0,-0.066 0,-0.033 -0.025,0 c 0,-26.648 -10.8,-50.78 -28.253,-68.225 -17.437,-17.444 -41.544,-28.22 -68.175,-28.236 l 0,-0.017 -0.066,0 -0.025,0 0,0.017 c -26.656,0.016 -50.779,10.808 -68.232,28.269 -17.429,17.429 -28.212,41.528 -28.229,68.175 l -0.007,0 0,0.05 0,0.033 0.007,0 c 0.009,26.647 10.809,50.779 28.27,68.224 17.429,17.429 41.535,28.204 68.158,28.22 l 0,0.016 0.058,0 z"
+         style="fill:#6f7073;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path26"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g28"
+       transform="matrix(1.25,0,0,-1.25,-291.17824,517.00047)">
+      <path
+         d="M 0,0 C -0.514,1.143 -0.993,2.301 -1.44,3.443 -2.011,4.899 -2.565,6.438 -3.079,8.027 -5.645,15.973 -6.96,24.265 -6.96,32.606 l 0,0.034 0.017,0 c 0.007,22.046 8.954,42.023 23.412,56.472 14.44,14.433 34.385,23.371 56.423,23.387 l 0,0.017 0.057,0 0.026,0 0,-0.017 c 22.054,0 42.04,-8.954 56.48,-23.403 l 0,-0.017 c 14.434,-14.433 23.362,-34.377 23.379,-56.406 l 0.017,0 0,-0.067 0,-0.083 -0.017,0 c 0,-7.017 -0.927,-13.968 -2.723,-20.639 -0.272,-1.042 -0.603,-2.135 -0.943,-3.244 -1.407,-4.486 -3.235,-8.855 -5.445,-13.076 l -7.39,4.371 c 1.854,3.607 3.4,7.381 4.626,11.254 0.281,0.927 0.57,1.904 0.844,2.929 1.614,6.009 2.449,12.198 2.449,18.405 l -0.008,0 0,0.083 0,0.067 0.008,0 c -0.008,19.646 -7.985,37.455 -20.879,50.348 l -0.009,-0.016 c -12.909,12.91 -30.735,20.904 -50.389,20.904 l 0,-0.016 -0.026,0 -0.057,0 0,0.016 C 53.237,103.909 35.42,95.915 22.526,83.021 9.633,70.145 1.639,52.319 1.639,32.64 l 0.016,0 0,-0.034 c 0,-7.498 1.175,-14.896 3.45,-21.947 L 6.57,6.571 7.887,3.41 0,0 Z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path30"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g32"
+       transform="matrix(1.25,0,0,-1.25,-289.90624,515.55147)">
+      <path
+         d="M 0,0 -2.118,6.604 13.167,11.47 15.269,4.85 0,0 Z m 144.559,1.639 -3.211,-6.174 -14.243,7.382 3.195,6.174 14.259,-7.382 z m -0.711,59.882 2.126,-6.604 -15.293,-4.866 -2.102,6.603 15.269,4.867 z m -42.802,41.858 6.165,-3.194 -7.374,-14.235 -6.182,3.178 7.391,14.251 z M 41.155,102.7 47.768,104.802 52.642,89.525 46.037,87.423 41.155,102.7 Z M 14.606,81.614 21.997,88.996 33.31,77.642 25.936,70.26 14.606,81.614 Z m 52.742,25.621 10.443,0 0,-16.021 -10.443,0 0,16.021 z m 55.429,-19.133 7.391,-7.414 -11.338,-11.338 -7.382,7.398 11.329,11.354 z m 25.638,-63.209 -16.021,0 0,10.444 16.021,0 0,-10.444 z M -4.56,36.611 l 16.029,0 0,-10.428 -16.029,0 0,10.428 z m 3.857,23.254 3.202,6.174 14.243,-7.365 -3.194,-6.174 -14.251,7.365 z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path34"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g36"
+       transform="matrix(1.25,0,0,-1.25,-199.97099,453.2981)">
+      <path
+         d="m 0,0 0,-0.017 -0.033,0 -0.058,0 0,0.017 c -5.222,-0.017 -9.964,-2.136 -13.389,-5.578 -3.435,-3.426 -5.579,-8.176 -5.579,-13.423 l 0,-0.033 0,-0.05 c 0.009,-5.23 2.135,-9.98 5.562,-13.406 3.434,-3.443 8.192,-5.578 13.439,-5.595 l 0,0.017 0.025,0 0.066,0 0,-0.017 c 5.222,0.017 9.964,2.152 13.399,5.578 3.442,3.443 5.578,8.193 5.586,13.44 l -0.008,0 0,0.033 0,0.066 0.008,0 c -0.017,5.214 -2.144,9.947 -5.57,13.373 C 10.014,-2.152 5.247,-0.017 0,0 M -0.033,3.724 0,3.724 0,3.707 c 6.281,0 11.967,-2.565 16.08,-6.67 4.096,-4.088 6.637,-9.749 6.653,-16.005 l 0.009,0 0,-0.066 0,-0.033 -0.009,0 C 22.726,-25.34 20.176,-31.034 16.055,-35.139 11.959,-39.243 6.29,-41.775 0.033,-41.792 l 0,-0.017 -0.066,0 -0.025,0 0,0.017 c -6.272,0 -11.966,2.549 -16.071,6.67 -4.097,4.104 -6.637,9.782 -6.653,16.038 l -0.009,0 0,0.05 0,0.033 0.009,0 c 0.008,6.272 2.556,11.967 6.67,16.071 4.096,4.088 9.765,6.637 16.021,6.637 l 0,0.017 0.058,0 z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path38"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g40"
+       transform="matrix(1.25,0,0,-1.25,-198.23261,467.63647)">
+      <path
+         d="M 0,0 30.661,28.767 33.648,25.721 6.248,-6.72 c 0.033,-0.264 0.058,-0.562 0.058,-0.86 0,-4.254 -3.459,-7.713 -7.713,-7.713 -4.262,0 -7.721,3.459 -7.721,7.713 0,4.27 3.459,7.729 7.721,7.729 C -0.927,0.149 -0.464,0.083 0,0"
+         style="fill:#6f7073;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path42"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g44"
+       transform="matrix(1.25,0,0,-1.25,-434.31599,367.23172)">
+      <path
+         d="m 0,0 0,-0.017 0.033,0 0.05,0 0,0.017 C 24.347,0 46.302,-9.832 62.2,-25.721 78.097,-41.61 87.929,-63.59 87.937,-87.854 l -0.024,0 0,-0.033 0,-0.05 0.024,0 C 87.92,-112.201 78.089,-134.165 62.2,-150.054 46.302,-165.959 24.339,-175.791 0.058,-175.791 l 0,0.017 -0.025,0 -0.066,0 0,-0.017 c -24.264,0.017 -46.219,9.832 -62.117,25.737 -15.897,15.889 -25.729,37.853 -25.737,62.134 l 0.016,0 0,0.033 0,0.066 -0.016,0 c 0.016,24.247 9.84,46.195 25.72,62.084 l 0.017,0 C -46.261,-9.832 -24.289,0 0,0 M 0.033,8.606 0,8.606 0,8.59 C -26.647,8.574 -50.779,-2.201 -68.224,-19.663 l -0.008,0 -0.009,0 C -85.677,-37.108 -96.452,-61.207 -96.46,-87.821 l -0.025,0 0,-0.066 0,-0.033 0.025,0 c 0,-26.648 10.799,-50.78 28.252,-68.225 17.437,-17.444 41.544,-28.22 68.175,-28.236 l 0,-0.017 0.066,0 0.025,0 0,0.017 c 26.656,0.016 50.779,10.808 68.233,28.269 17.419,17.429 28.211,41.528 28.228,68.175 l 0.008,0 0,0.05 0,0.033 -0.008,0 C 96.502,-61.207 85.71,-37.075 68.25,-19.63 50.821,-2.201 26.714,8.574 0.083,8.59 l 0,0.016 -0.05,0 z"
+         style="fill:#6f7073;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path46"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g48"
+       transform="matrix(1.25,0,0,-1.25,-343.10811,517.00047)">
+      <path
+         d="M 0,0 C 0.513,1.143 0.993,2.301 1.44,3.443 2.011,4.899 2.565,6.438 3.079,8.027 5.645,15.973 6.96,24.265 6.96,32.606 l 0,0.034 -0.017,0 c -0.007,22.046 -8.962,42.023 -23.411,56.472 -14.441,14.433 -34.386,23.371 -56.424,23.387 l 0,0.017 -0.058,0 -0.024,0 0,-0.017 c -22.055,0 -42.041,-8.954 -56.482,-23.403 l 0,-0.017 c -14.432,-14.433 -23.37,-34.377 -23.378,-56.406 l -0.025,0 0,-0.067 0,-0.083 0.025,0 c 0,-7.017 0.927,-13.968 2.723,-20.639 0.273,-1.042 0.595,-2.135 0.943,-3.244 1.407,-4.486 3.236,-8.855 5.437,-13.076 l 7.398,4.371 c -1.854,3.607 -3.401,7.381 -4.625,11.254 -0.291,0.927 -0.572,1.904 -0.845,2.929 -1.614,6.009 -2.449,12.198 -2.449,18.405 l 0.008,0 0,0.083 0,0.067 -0.008,0 c 0.008,19.646 7.985,37.455 20.879,50.348 l 0.008,-0.016 c 12.91,12.91 30.728,20.904 50.391,20.904 l 0,-0.016 0.024,0 0.058,0 0,0.016 c 19.655,0 37.464,-7.994 50.366,-20.888 C -9.633,70.145 -1.639,52.319 -1.639,32.64 l -0.016,0 0,-0.034 c 0,-7.498 -1.175,-14.896 -3.451,-21.947 L -6.571,6.571 -7.887,3.41 0,0 Z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path50"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g52"
+       transform="matrix(1.25,0,0,-1.25,-344.38011,515.55147)">
+      <path
+         d="M 0,0 2.118,6.604 -13.167,11.47 -15.269,4.85 0,0 Z m -144.559,1.639 3.211,-6.174 14.243,7.382 -3.203,6.174 -14.251,-7.382 z m 0.712,59.882 -2.127,-6.604 15.285,-4.866 2.11,6.603 -15.268,4.867 z m 42.802,41.858 -6.166,-3.194 7.365,-14.235 6.191,3.178 -7.39,14.251 z m 59.89,-0.679 -6.612,2.102 -4.875,-15.277 6.604,-2.102 4.883,15.277 z m 26.549,-21.086 -7.391,7.382 -11.313,-11.354 7.374,-7.382 11.33,11.354 z m -52.741,25.621 -10.444,0 0,-16.021 10.444,0 0,16.021 z m -55.43,-19.133 -7.39,-7.414 11.337,-11.338 7.382,7.398 -11.329,11.354 z m -25.639,-63.209 16.022,0 0,10.444 -16.022,0 0,-10.444 z M 4.56,36.611 l -16.03,0 0,-10.428 16.03,0 0,10.428 z M 0.695,59.865 -2.5,66.039 -16.742,58.674 -13.547,52.5 0.695,59.865 Z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path54"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g56"
+       transform="matrix(1.25,0,0,-1.25,-434.31599,453.2981)">
+      <path
+         d="m 0,0 0,-0.017 0.033,0 0.05,0 0,0.017 c 5.23,-0.017 9.972,-2.136 13.398,-5.578 3.435,-3.426 5.578,-8.176 5.578,-13.423 l 0,-0.033 0,-0.05 c -0.008,-5.23 -2.135,-9.98 -5.561,-13.406 -3.435,-3.443 -8.202,-5.578 -13.44,-5.595 l 0,0.017 -0.025,0 -0.066,0 0,-0.017 c -5.222,0.017 -9.964,2.152 -13.398,5.578 -3.443,3.443 -5.578,8.193 -5.586,13.44 l 0.008,0 0,0.033 0,0.066 -0.008,0 c 0.017,5.214 2.143,9.947 5.569,13.373 C -10.013,-2.152 -5.247,-0.017 0,0 M 0.033,3.724 0,3.724 0,3.707 c -6.281,0 -11.966,-2.565 -16.079,-6.67 l -0.008,0 c -4.089,-4.088 -6.629,-9.749 -6.654,-16.005 l 0,-0.066 0,-0.033 c 0.016,-6.273 2.565,-11.967 6.678,-16.072 4.105,-4.104 9.774,-6.636 16.03,-6.653 l 0,-0.017 0.066,0 0.025,0 0,0.017 c 6.273,0 11.967,2.549 16.071,6.67 4.097,4.104 6.638,9.782 6.654,16.038 l 0.009,0 0,0.05 0,0.033 -0.009,0 c -0.008,6.272 -2.557,11.967 -6.67,16.071 -4.105,4.088 -9.765,6.637 -16.03,6.637 l 0,0.017 -0.05,0 z"
+         style="fill:#70bf44;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path58"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g60"
+       transform="matrix(1.25,0,0,-1.25,-436.05374,467.63647)">
+      <path
+         d="m 0,0 -30.661,28.767 -2.987,-3.046 27.4,-32.441 c -0.033,-0.264 -0.058,-0.562 -0.058,-0.86 0,-4.254 3.451,-7.713 7.713,-7.713 4.262,0 7.721,3.459 7.721,7.713 0,4.27 -3.459,7.729 -7.721,7.729 C 0.927,0.149 0.463,0.083 0,0"
+         style="fill:#6f7073;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path62"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>