Merge pull request #29 from BRaimbault/v0.8-dev

v0.8.3 update dependencies and licenses

app/app.config.js

@@ -3,13 +3,13 @@
  Please refer to the LICENSE.md and LICENSES-DEP.md for complete licenses.
 ------------------------------------------------------------------------------------*/
 
-var graphModule = angular.module('graphModule', ['angucomplete-alt']);
+/*var graphModule = angular.module('graphModule', ['angucomplete-alt']);*/
 var dossiersEditorModule = angular.module('dossiersEditorModule', ['ui.tinymce']);
 var dossiersReaderModule = angular.module('dossiersReaderModule', []);
-var searchModule = angular.module('searchModule', ['ngTable', 'angular.filter', 'ui.bootstrap']);
+var searchModule = angular.module('searchModule', ['ngTable', 'ui.bootstrap']);
 var dossiersModule = angular.module('dossiersModule', ['dossiersEditorModule','dossiersReaderModule']);
 
-var appModule = angular.module('appModule', ['ui.router', 'd2Menu', 'ngSanitize', 'pascalprecht.translate', 'ngResource', 'dossiersModule', 'searchModule', 'graphModule']);
+var appModule = angular.module('appModule', ['ui.router', 'd2Menu', 'ngSanitize', 'pascalprecht.translate', 'ngResource', 'dossiersModule', 'searchModule'/*, 'graphModule'*/]);
 
 /*
  * @alias appModule.config

app/app.controllers.js

@@ -35,6 +35,25 @@ appModule.controller('appSharedController', ['$scope', '$translate', '$state', '
  });
  };
 
+ csv_to_json = function(csv) {
+ console.log(csv);
+ var lines = csv.split("\n");
+ var result = [];
+ var headers = lines[0].split(",");
+
+ for (var i = 1; i < lines.length; i++) {
+ var obj = {};
+ var currentline = lines[i].split(",");
+ for (var j = 0; j < headers.length; j++) {
+ obj[headers[j]] = currentline[j];
+ }
+ result.push(obj);
+ }
+
+ //return result; //JavaScript object
+ return JSON.stringify(result); //JSON
+ };
+
  /*
  * @alias appModule.controller~tabSwitch
  * @type {Function}

app/app.services.js

@@ -27,3 +27,23 @@ appModule.factory('Ping', ['$resource',
  });
  }
 ]);
+
+appModule.factory('csv_to_json', [
+ function(csv) {
+ var lines = csv.split("\n");
+ var result = [];
+ var headers = lines[0].split(",");
+
+ for (var i = 1; i < lines.length; i++) {
+ var obj = {};
+ var currentline = lines[i].split(",");
+ for (var j = 0; j < headers.length; j++) {
+ obj[headers[j]] = currentline[j];
+ }
+ result.push(obj);
+ }
+
+ //return result; //JavaScript object
+ return JSON.stringify(result); //JSON
+ }
+]);

bower.json

@@ -1,27 +1,25 @@
 {
- "name": "HMIS dossier",
- "description": "dossier repository for HMIS",
+ "name": "HMIS_Dictionary",
+ "description": "Dossiers and Medical terminology browser for MSF OCBA HMIS",
  "version": "0.0.0",
  "private": true,
  "resolutions" : {
- "angular": "1.5.8"
+ "angular": "1.5.9"
  },
  "dependencies": {
- "angucomplete-alt": "2.4.2",
- "angular-animate": "1.5.8",
- "angular-filter": "0.5.11",
- "angular-resource": "1.5.8",
- "angular-sanitize": "1.5.8",
+ "angucomplete-alt": "2.5.0",
+ "angular-resource": "1.5.9",
+ "angular-sanitize": "1.5.9",
  "angular-table": "2.1.0",
  "angular-translate": "2.9.0",
- "angular-translate-loader-static-files": "2.9.0",
- "angular-ui-router": "0.2.18",
- "angular-ui-tinymce": "0.0.16",
- "angular-utils": "?",
- "bootstrap": "3.3.6",
+ "angular-translate-loader-static-files": "2.11.0",
+ "angular-ui-bootstrap": "2.3.0",
+ "angular-ui-router": "0.3.2",
+ "angular-ui-tinymce": "0.0.17",
+ "bootstrap": "3.3.7",
  "bootstrap-vertical-tabs": "1.2.1",
- "d3": "4.2.2",
- "jquery": "2.2.0",
- "tinymce": "4.4.1"
+ "jquery": "2.2.4",
+ "tinymce": "4.5",
+ "d3": "4.4.0"
  }
 }

bower_components/angucomplete-alt/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2014 Hidenari Nozaki and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.