Merge branch 'django' into 'javascript'

license js

See merge request !3

README.md

+# AdIm : annotations on picture
+
+This is a web application for annotating pictures, which can be linked to Moodle. 
+
+Authors: 
+- Julien Furrer, <julien.furrer@unil.ch>
+- Marion Chardon, <marion.chardon@unil.ch>
+
+## Description
+
+This web tool allows:
+
+- a "student" part:
+    - to import picture
+    - to annotate picture with symbols
+    - to comment and bring more details to an annotation
+    - to export result in PNG or SVG format
+    - to share picture with an other user or a group (as a Moodle activity for example)
+- a "teacher" part:
+    - to see students annotations
+    - to compare annotations from different users on the same picture
+
+See this <a href="https://gitlabriset.unil.ch/Marion.Chardon/ADIM/wikis/home">wiki page</a> for screenshots.
+
+## Technologies
+
+The main used technologies are :
+- Python 2.7
+- Django 1.8
+- Jquery 3.3
+- Bootstrap 4.0
+
+## Installation
+### Staging/Production
+
+ 1. Clone the project git
+ 2. Set the database
+ 3. Change configuration files (adim_projet/adim_project)
+    1. apache configuration
+    2. django settings
+    3. wsgi file 
+ 4. Configure apache server
+ 5. Set right for your webuser to media repository
+ 6. Set ADIM moodle's plugin if you want to add an annotation activity
+
+### Developement
+
+1. Clone the project git
+2. Set the database
+3. Change configuration files (adim_projet/adim_project)
+    1. apache configuration
+    2. django settings
+4. Add javascript library (adim_project/adim_app/static/_src/lib) with bower
+
+## What's next?
+
+Improvements, bugs corrections or new contexts of annotation. 
+
+## Contributors and Licenses
+
+Copyright: University of Lausanne, RISET
+Authors:
+- Julien Furrer, <julien.furrer@unil.ch>
+- Marion Chardon, <marion.chardon@unil.ch>
+
+'AdIm' is a free software released under the GNU GPL licence, version 3.

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

 /**
- * Item category management
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *   @CREATION-DATE: 08.07.15
  *
- * Created by jfurrer on 08.07.15.
+ */
+/**
+ * Item category management
  */
 
 define(["underscore", "paper", "signals"], function (_, paper, Signal) {

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

 /**
- * Created by jfurrer on 02.12.13.
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *   @CREATION-DATE: 02.12.13
+ *
  */
 /*
 requirejs.config({

adim_project/adim_app/static/_src/adim/env/anodate/env.js

 /**
- * anodate environment
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   anodate environment
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *   @CREATION-DATE: 30.06.15.
  *
- * Created by jfurrer on 30.06.15.
  */
 define([
         "jquery",

adim_project/adim_app/static/_src/adim/env/anodate/shortcuts.js

@@ -14,8 +14,10 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   This copyright notice MUST APPEAR in all copies of the file.
  *
+ *   anodate environment
+ *
  *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
- *   @CREATION-DATE: 30.06.15
+ *   @CREATION-DATE: 30.06.15.
  *
  */
 define([

adim_project/adim_app/static/_src/adim/env/cimaf/env.js

 /**
- * Created by jfurrer on 22.06.15.
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   cimaf environment
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *   @CREATION-DATE: 22.06.15.
+ *
  */
 
-
 define([
         "jquery",
         "underscore",

adim_project/adim_app/static/_src/adim/env/cimaf/shortcuts.js

@@ -14,10 +14,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   This copyright notice MUST APPEAR in all copies of the file.
  *
+ *   cimaf environment
+ *
  *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
- *   @CREATION-DATE: 29.06.15
+ *   @CREATION-DATE: 22.06.15.
  *
  */
+
 define([
         "jquery",
         "paper",

adim_project/adim_app/static/_src/adim/env/cimaf/ui-analyse.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   cimaf environment
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *   @CREATION-DATE: 22.06.15.
+ *
+ */
+
 define(
 [
     "jquery",

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

 /**
- * This module is a proxy for the various environement defined
- * It could be bypassed if the environment is directly defined in
- * the main app by overriding the "env" path. See su_app.js
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ */
+/**
+ *   This module is a proxy for the various environement defined
+ *   It could be bypassed if the environment is directly defined in
+ *   the main app by overriding the "env" path. See su_app.js
  */
-
 
 define([
         "underscore",

adim_project/adim_app/static/_src/adim/env/geomo/env.js

 /**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   cimaf environment
+ *
+ *   @AUTHOR: Marion Chardon <Marion.Chardon@unil.ch>
+ *   @CREATION-DATE: 11.01.17.
  *
- * Created by mchardon on 11.01.17.
  */
+
 define([
         "jquery",
         "underscore",

adim_project/adim_app/static/_src/adim/env/geomo/shortcuts.js

@@ -14,10 +14,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   This copyright notice MUST APPEAR in all copies of the file.
  *
- *   @AUTHOR: marion.chardon@unil.ch
- *   @CREATION-DATE: 11.01.17
+ *   cimaf environment
+ *
+ *   @AUTHOR: Marion Chardon <Marion.Chardon@unil.ch>
+ *   @CREATION-DATE: 11.01.17.
  *
  */
+
 define([
         "jquery",
         "paper",

adim_project/adim_app/static/_src/adim/env/shortcuts.js

@@ -16,8 +16,8 @@
  *
  *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
  *   @CREATION-DATE: 29.06.15
- *
  */
+
 define([
         "jquery",
         "paper",

adim_project/adim_app/static/_src/adim/helper/bootstrap-rating-input.js

-// Customized version of https://github.com/javiertoledo/bootstrap-rating-input
-// based on an old old version
+/**
+ * Customized version of https://github.com/javiertoledo/bootstrap-rating-input
+ * based on an old old version
+ */
+
 (function ($) {
 
     $.fn.rating = function (cmd) {

adim_project/adim_app/static/_src/adim/helper/exporter.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define([
     "jquery",
     "paper",

adim_project/adim_app/static/_src/adim/helper/initialSettings.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define(["jquery"], function($){
     var defaultSettings = {
         color: "#FF0000",

adim_project/adim_app/static/_src/adim/helper/utils.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define(["paper"], function (paper) {
     // ----- Locale variables -----------------------------
 

adim_project/adim_app/static/_src/adim/tools/Shape.class.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define(["paper"],
 function () {
     // ----- Returned Class Module ------------------------------

adim_project/adim_app/static/_src/adim/tools/arrow.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define(["paper"], function (paper) {
     // ----- Const ----------------------------------------
     var TOOL_TYPE = 'arrow';

adim_project/adim_app/static/_src/adim/tools/arrow1.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Julien Furrer <Julien.Furrer@unil.ch>
+ *
+ */
+
 define(["paper"], function (paper) {
     // ----- Const ----------------------------------------
     var TOOL_TYPE = 'arrow1';

adim_project/adim_app/static/_src/adim/tools/arrowgeo.js

+/**
+ *   Copyright (C) 2014 Université de Lausanne, RISET,
+ *   < http://www.unil.ch/riset/ >
+ *   This file is part of AdIm.
+ *   AdIm is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *   AdIm is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   This copyright notice MUST APPEAR in all copies of the file.
+ *
+ *   @AUTHOR: Marion Chardon <Marion.Chardon@unil.ch>
+ *
+ */
+
 define(["paper", "tools/Shape.class","adim/category"], function (paper,Shape, Category) {
     // ----- Const ----------------------------------------
     var TOOL_TYPE = 'arrowgeo';