Home upload

.gitignore

@@ -13,3 +13,6 @@ venv/
 
 **/__pycache__
 *.py[cod]
+
+npm-debug.log
+test/e2e/webdriver.log

Gruntfile.coffee

@@ -6,26 +6,26 @@
 # use this if you want to recursively match all subfolders:
 # 'test/spec/**/*.js'
 module.exports = (grunt) ->
-  
+
   # Load grunt tasks automatically
   require("load-grunt-tasks") grunt
-  
+
   # Time how long tasks take. Can help when optimizing build times
   require("time-grunt") grunt
-  
+
   # Configurable paths for the application
   appConfig =
     app: require("./bower.json").appPath or "app"
     dist: "dist"
 
   grunt.loadNpmTasks "grunt-protractor-runner"
-  
+
   # Define the configuration for all the tasks
   grunt.initConfig
-    
+
     # Project settings
     yeoman: appConfig
-    
+
     # Watches files for changes and runs tasks based on the changed files
     watch:
       bower:
@@ -64,7 +64,7 @@ module.exports = (grunt) ->
           "<%= yeoman.app %>/images/**/*.{png,jpg,jpeg,gif,webp,svg}"
         ]
 
-    
+
     # The actual grunt server settings
     connect:
       options:
@@ -99,7 +99,7 @@ module.exports = (grunt) ->
           open: true
           base: "<%= yeoman.dist %>"
 
-    
+
     # Make sure code styles are up to par and there are no obvious mistakes
     jshint:
       options:
@@ -109,7 +109,7 @@ module.exports = (grunt) ->
       all:
         src: ["Gruntfile.js"]
 
-    
+
     # Empties folders to start fresh
     clean:
       dist:
@@ -138,14 +138,14 @@ module.exports = (grunt) ->
           dest: ".tmp/styles/"
         ]
 
-    
+
     # Automatically inject Bower components into the app
     wiredep:
       app:
         src: ["<%= yeoman.app %>/index.html"]
         ignorePath: /\.\.\//
 
-    
+
     # Compiles CoffeeScript to JavaScript
     coffee:
       options:
@@ -170,7 +170,7 @@ module.exports = (grunt) ->
           ext: ".js"
         ]
 
-    
+
     # Renames files for browser caching purposes
     filerev:
       dist:
@@ -181,7 +181,7 @@ module.exports = (grunt) ->
           "<%= yeoman.dist %>/styles/fonts/*"
         ]
 
-    
+
     # Reads HTML for usemin blocks to enable smart builds that automatically
     # concat, minify and revision files. Creates configurations in memory so
     # additional tasks can operate on them
@@ -200,7 +200,7 @@ module.exports = (grunt) ->
 
             post: {}
 
-    
+
     # Performs rewrites based on filerev and the useminPrepare configuration
     usemin:
       html: ["<%= yeoman.dist %>/**/*.html"]
@@ -211,7 +211,7 @@ module.exports = (grunt) ->
           "<%= yeoman.dist %>/images"
         ]
 
-    
+
     # The following *-min tasks will produce minified files in the dist folder
     # By default, your `index.html`'s <!-- Usemin block --> will take care of
     # minification. These next options are pre-configured if you do not wish
@@ -277,7 +277,7 @@ module.exports = (grunt) ->
           dest: "<%= yeoman.dist %>"
         ]
 
-    
+
     # ng-annotate tries to make the code safe for minification automatically
     # by using the Angular long form for dependency injection.
     ngAnnotate:
@@ -292,13 +292,13 @@ module.exports = (grunt) ->
           dest: ".tmp/concat/scripts"
         ]
 
-    
+
     # Replace Google CDN references
     cdnify:
       dist:
         html: ["<%= yeoman.dist %>/*.html"]
 
-    
+
     # Copies remaining files to places other tasks can use
     copy:
       dist:
@@ -343,7 +343,7 @@ module.exports = (grunt) ->
         dest: ".tmp/styles/"
         src: "**/*.css"
 
-    
+
     # Run some tasks in parallel to speed up the build process
     concurrent:
       server: [
@@ -361,7 +361,7 @@ module.exports = (grunt) ->
         "svgmin"
       ]
 
-    
+
     # Test settings
     karma:
       options:
@@ -373,7 +373,7 @@ module.exports = (grunt) ->
       server:
         singleRun: false
 
-    
+
     # E2e test settings
     protractor:
       options:

app/index.html

@@ -17,6 +17,7 @@
     <link rel="stylesheet" href="bower_components/datatables/media/css/jquery.dataTables.css" />
     <link rel="stylesheet" href="bower_components/angular-datatables/dist/plugins/bootstrap/datatables.bootstrap.css" />
     <link rel="stylesheet" href="bower_components/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css" />
+    <link rel="stylesheet" href="bower_components/sc-toggle-switch/release/css/toggle_switch.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -46,7 +47,9 @@
       <footer class="footer">
         <div class="container">
           <a href="http://scille.eu" target="_blank">
-            <img src="images/logo-scille.png" width="20">&nbsp;Scille</a> vigiechiro
+            <img src="images/logo-scille.png" width="20">&nbsp;Scille
+          </a>
+          vigiechiro {version}
         </div>
       </footer>
     </content-directive>
@@ -82,7 +85,7 @@
     <script src="bower_components/angular-animate/angular-animate.js"></script>
     <script src="bower_components/angular-touch/angular-touch.js"></script>
     <script src="bower_components/angular-route/angular-route.js"></script>
-    <script src="bower_components/lodash/dist/lodash.compat.js"></script>
+    <script src="bower_components/lodash/lodash.js"></script>
     <script src="bower_components/restangular/dist/restangular.js"></script>
     <script src="bower_components/flow.js/dist/flow.js"></script>
     <script src="bower_components/ng-flow/dist/ng-flow.js"></script>
@@ -117,6 +120,8 @@
     <script src="bower_components/angular-bootstrap-switch/dist/angular-bootstrap-switch.js"></script>
     <script src="bower_components/moment/moment.js"></script>
     <script src="bower_components/angular-moment/angular-moment.js"></script>
+    <script src="bower_components/sc-toggle-switch/release/scripts/toggle_switch.js"></script>
+    <script src="bower_components/sc-toggle-switch/release/scripts/populate_template_cache.js"></script>
     <!-- endbower -->
     <script src="bower_components/moment/locale/fr.js"></script>
     <!-- endbuild -->
@@ -145,6 +150,7 @@
     <script src="scripts/views/participation/modal/modal_participation.js"></script>
     <script src="scripts/views/actualite/actualite_ctrl.js"></script>
     <script src="scripts/views/donnee/donnee_ctrl.js"></script>
+    <script src="scripts/views/participation_upload/upload_ctrl.js"></script>
 
     <script src="scripts/xin/tools.js"></script>
     <script src="scripts/xin/services/geolocation_srv.js"></script>

app/scripts/app.coffee

@@ -30,7 +30,8 @@ angular
     'siteViews'
     'participationViews',
     'actualiteViews',
-    'donneeViews'
+    'donneeViews',
+    'uploadParticipationViews'
   ])
 
   .run (Backend, SETTINGS) ->
@@ -56,6 +57,8 @@ angular
       .otherwise
         redirectTo: '/404'
 
+
+
   .directive 'navbarDirective', (evalCallDefered, $window, $rootScope, $route, SETTINGS, session)->
     restrict: 'E'
     templateUrl: 'navbar.html'

app/scripts/settings.coffee

@@ -5,4 +5,19 @@ angular.module('appSettings', [])
   .constant 'SETTINGS',
     API_DOMAIN: 'http://localhost:8080'
     FRONT_DOMAIN: 'http://localhost:9000'
+    S3_BUCKET_URL: 'https://vigiechiro.s3.amazonaws.com/'
     BASE_TITLE: 'Vigiechiro'
+    USER_FIELDS: [
+      "pseudo",
+      "email",
+      "nom",
+      "prenom",
+      "telephone",
+      "adresse",
+      "commentaire",
+      "organisation",
+      "professionnel",
+      "donnees_publiques",
+      "role",
+      "vitesse_connexion"
+    ]

app/scripts/views/participation/display_participation.html

@@ -1,13 +1,58 @@
-<a class="btn btn-default" href="#/protocoles/{{participation.protocole._id}}">
-  Voir le protocole {{ participation.protocole.titre }}
-</a>
-<a class="btn btn-default" href="#/sites/{{participation.site._id}}">
-  Voir le site {{ participation.site.titre }}
-</a>
+<div class="actionbar">
+  <a class="btn btn-default" href="#/protocoles/{{participation.protocole._id}}">
+    Voir le protocole {{ participation.protocole.titre }}
+  </a>
+  <a class="btn btn-default" href="#/sites/{{participation.site._id}}">
+    Voir le site {{ participation.site.titre }}
+  </a>
+  <a class="btn btn-primary" href="#/participations/{{participation._id}}/donnees">
+    Voir les données
+  </a>
+  <a class="btn btn-primary" href="#/participations/{{participation._id}}/edition">
+    Editer la participation
+  </a>
+  <a class="btn btn-primary" href="#/participations/{{participation._id}}/telechargement">
+    Uploader les fichiers
+  </a>
+  <sc-button class="btn btn-danger"
+             ng-click="delete()"
+             label="'Supprimer la participation'"
+             wait-for-class=""
+             cancel-wait-for="">
+  </sc-button>
+  <sc-button class="btn btn-primary"
+             ng-click="getDonnees()"
+             label="'Recevoir les données par email'"
+             wait-for-class=""
+             cancel-wait-for="">
+  </sc-button>
+  <sc-button class="btn btn-warning"
+             ng-click="compute()"
+             label="'Lancer la participation'"
+             wait-for-class=""
+             cancel-wait-for=""
+             ng-if="isAdmin && !participation.traitement">
+  </sc-button>
+  <sc-button class="btn btn-warning"
+             ng-click="compute()"
+             label="'Relancer la participation'"
+             wait-for-class=""
+             cancel-wait-for=""
+             ng-if="isAdmin && (participation.traitement.etat == 'FINI' || participation.traitement.etat == 'ERREUR' || participation.traitement.timeout)">
+  </sc-button>
+</div>
 
-<a class="btn btn-danger" href="" ng-click="delete()">
-  Supprimer la participation
-</a>
+<div class="alert alert-success" ng-show="isCsvPost">
+  Demande de réception des données par email : reçue
+</div>
+<div class="alert alert-danger" ng-show="isCsvPost == false">
+  Echec de la demande de réception des données par email
+</div>
+<div ng-show="computeInfo">
+  <span class="label label-danger" ng-if="computeInfo.error">
+    La demande de relance de la participation a échoué.
+  </span>
+</div>
 
 <display-participation-directive participation="participation">
 </display-participation-directive>
@@ -17,10 +62,6 @@
   <a class="input-group-addon" ng-click="addPost()">Ajouter un message</a>
 </div>
 
-<a class="btn btn-primary" href="#/participations/{{participation._id}}/edition">
-  Editer la participation
-</a>
-
 <hr>
 
 <div class="table-responsive">
@@ -90,32 +131,9 @@ <h4>Bilan de la participation</h4>
     Début du traitement : {{ participation.traitement.date_debut | xinDate: 'medium' }}-->
   </span>
 </div>
-<div ng-show="computeInfo">
-  <span class="label label-danger" ng-if="computeInfo.error">
-    La demande de relance de la participation a échoué.
-  </span>
-</div>
 
-<!-- Buttons -->
 <div>
-  <a class="btn btn-primary" href="#/participations/{{participation._id}}/donnees">
-    Voir les données
-  </a>
-  <a class="btn btn-primary" href="" ng-click="getDonnees()">
-    Recevoir les données par email
-  </a>
-  <a class="btn btn-warning" href="" ng-click="compute()"
-     ng-if="isAdmin && (participation.traitement.etat == 'FINI' || participation.traitement.etat == 'ERREUR' || participation.traitement.timeout)">
-    Relancer la participation
-  </a>
   <span ng-if="participation.logs">
     <access-file-directive file="participation.logs"></access-file-directive>
   </span>
 </div>
-
-<div class="alert alert-success" ng-show="isCsvPost">
-  Demande de réception des données par email : reçue
-</div>
-<div class="alert alert-danger" ng-show="isCsvPost == false">
-  Echec de la demande de réception des données par email
-</div>