Réorganisé code en application spécifique, fixé bug minueur

adim_project/adim_app/static/_src/Gruntfile.js

@@ -61,6 +61,26 @@ module.exports = function(grunt) {
                     name: "../js/newao_app",
                     out: "../js/newao_app" + jsOptimizedSuffix + ".js"
                 }
+            },
+
+            cimaf_app: {
+                options: {
+                    paths: {
+                        env: "_build/adim/env/cimaf"
+                    },
+                    name: "../js/cimaf_app",
+                    out: "../js/cimaf_app" + jsOptimizedSuffix + ".js"
+                }
+            },
+
+            cimaf_analysis: {
+                options: {
+                    paths: {
+                        env: "_build/adim/env/cimaf"
+                    },
+                    name: "../js/cimaf_analysis",
+                    out: "../js/cimaf_analysis" + jsOptimizedSuffix + ".js"
+                }
             }
 
 
@@ -208,6 +228,6 @@ module.exports = function(grunt) {
     grunt.registerTask('libs', ['copy:libs', 'less:libs', 'concat:libs', 'less:adim']);
 
     // Build main app
-    grunt.registerTask('build app', ['uglify:adim', 'requirejs:main_su', 'requirejs:main_newao']);
+    grunt.registerTask('build app', ['uglify:adim', 'requirejs']);
 
 };
\ No newline at end of file

adim_project/adim_app/static/_src/adim/cimaf-analysis.js

@@ -30,6 +30,7 @@ requirejs([
     "adim/config",
     "adim/io",
     "adim/view",
+
     "env/ui-analyse"
 ],
 function ($, paper, Signal, config, io, view, ui) {

adim_project/adim_app/static/_src/adim/main-su.js

@@ -323,7 +323,7 @@ function ($, paper, Signal, config, view, io, tools, attributes, ui, Users, them
             }
         });
 //### DEBUG CODE ###
-        window.ADIM = { tools: tools };
+//        window.ADIM = { tools: tools };
 
         console.timeEnd("main dom ready");
     });

adim_project/adim_app/static/_src/adim/view.js

@@ -654,6 +654,7 @@ function ($, _, paper, Signal, config, Users, tools) {
                     paper.view.draw();
                 }
             }
+            console.log(">> before dispatch annotationsLoaded")
             _events.annotationsLoaded.dispatch();
 
             paper.project.deselectAll();

adim_project/adim_env/cimaf/views.py

@@ -39,7 +39,10 @@ def get_annot_export(anobj, user, no_header=False):
     for a in annotations:
         try:
             a.item = json.loads(a.item)
-            a.item_type = a.item[1].get('data').get('type')
+            item_rec = a.item[1]
+            if type(item_rec) != dict:
+                item_rec = a.item[1][1]
+            a.item_type = item_rec.get('data').get('type')
         except (TypeError, ValueError):
             a.item = None