Remove role classification. The functionality is working and all tests are passing.

Author: akbargumbira

users/__init__.py

@@ -33,8 +33,8 @@ def add_handler_once(logger, handler):
     :rtype bool: bool
     """
     class_name = handler.__class__.__name__
-    for handler in logger.handlers:
-        if handler.__class__.__name__ == class_name:
+    for logger_handler in logger.handlers:
+        if logger_handler.__class__.__name__ == class_name:
             return False
 
     logger.addHandler(handler)
@@ -62,24 +62,6 @@ def setup_logger():
     console_handler = logging.StreamHandler()
     console_handler.setLevel(logging.ERROR)
 
-    try:
-        #pylint: disable=F0401
-        from raven.handlers.logging import SentryHandler
-        # noinspection PyUnresolvedReferences
-        from raven import Client
-        #pylint: enable=F0401
-        client = Client(
-            'http://12ef42a1d4394255a2041ac0428e8ef7:'
-            '755880e336f54892bc2a65d308019997@sentry.linfiniti.com/6')
-        sentry_handler = SentryHandler(client)
-        sentry_handler.setFormatter(formatter)
-        sentry_handler.setLevel(logging.ERROR)
-        add_handler_once(logger, sentry_handler)
-        logger.debug('Sentry logging enabled')
-
-    except ImportError:
-        logger.debug('Sentry logging disabled. Try pip install raven')
-
     #Set formatters
     file_handler.setFormatter(formatter)
     console_handler.setFormatter(formatter)

users/config.py.prod

@@ -37,12 +37,7 @@ MAIL_CONFIG = dict(
 MAIL_ADMIN = ('InaSAFE User Map Administrator', MAIL_CONFIG['MAIL_USERNAME'])
 
 # USER ICONS: All icon paths that are used.
-# For now, there are only 3 icons that should be configured: user, trainer,
-# developer. And used the same shadow for all of the icons. Next time,
-# we can be more flexible about this (the role)
 USER_ICONS = dict(
     user='/static/img/user-icon.png',
-    trainer='/static/img/trainer-icon.png',
-    developer='/static/img/developer-icon.png',
     shadow='/static/img/shadow-icon.png'
 )

users/config.py.test

@@ -39,12 +39,7 @@ MAIL_CONFIG = dict(
 MAIL_ADMIN = ('InaSAFE User Map Administrator', MAIL_CONFIG['MAIL_USERNAME'])
 
 # USER ICONS: All icon paths that are used.
-# For now, there are only 3 icons that should be configured: user, trainer,
-# developer. And used the same shadow for all of the icons. Next time,
-# we can be more flexible about this (the role)
 USER_ICONS = dict(
     user='/static/img/user-icon.png',
-    trainer='/static/img/trainer-icon.png',
-    developer='/static/img/developer-icon.png',
     shadow='/static/img/shadow-icon.png'
 )

users/resources/create_table.sql

@@ -4,7 +4,6 @@
   name TEXT NOT NULL,
   email TEXT NOT NULL,
   website TEXT,
-  role INTEGER DEFAULT 0,
   email_updates BOOL DEFAULT 0,
   date_added DATETIME DEFAULT CURRENT_TIMESTAMP,
   latitude FLOAT,

users/static/js/user-map-component.js

@@ -44,22 +44,16 @@ function createIconMarkerBase(shadow_icon_path) {
 
 /**
  * Create all icons that are used.
- * @param {string} user_icon_path The icon path for user role.
- * @param {string} trainer_icon_path The icon path for trainer role.
- * @param {string} developer_icon_path The icon path for developer role.
+ * @param {string} user_icon_path The icon path for user.
  * @param {string} shadow_icon_path The shadow for all icons.
- * @returns {{user_icon: IconMarkerBase, trainer_icon: IconMarkerBase, developer_icon: IconMarkerBase}}
+ * @returns {{user_icon: IconMarkerBase}}
  */
-function createAllIcons(user_icon_path, trainer_icon_path, developer_icon_path, shadow_icon_path) {
+function createAllIcons(user_icon_path, shadow_icon_path) {
   var IconMarkerBase = createIconMarkerBase(shadow_icon_path);
   var user_icon = new IconMarkerBase({iconUrl: user_icon_path});
-  var trainer_icon = new IconMarkerBase({iconUrl: trainer_icon_path});
-  var developer_icon = new IconMarkerBase({iconUrl: developer_icon_path});
   var all_icons;
   all_icons = {
-    user_icon: user_icon,
-    trainer_icon: trainer_icon,
-    developer_icon: developer_icon
+    user_icon: user_icon
   };
   return all_icons;
 }

users/static/js/user-map-utilities.js

@@ -21,38 +21,6 @@ function showInformationModal(info_title, info_content) {
   });
 }
 
-/**
- * Return user icon based on user role.
- * @param user_role The role.
- */
-function getUserIcon(user_role) {
-  var role_icon;
-  if (user_role == USER_ROLE) {
-    role_icon = user_icon;
-  } else if (user_role == TRAINER_ROLE) {
-    role_icon = trainer_icon;
-  } else if (user_role == DEVELOPER_ROLE) {
-    role_icon = developer_icon;
-  }
-  return role_icon;
-}
-
-/**
- * Get User Layer that has been declared based on the role.
- * @param role The user role.
- */
-function getUserLayer(role) {
-  var layer;
-  if (role == USER_ROLE) {
-    layer = users_layer;
-  } else if (role == TRAINER_ROLE) {
-    layer = trainers_layer;
-  } else if (role == DEVELOPER_ROLE) {
-    layer = developers_layer;
-  }
-  return layer;
-}
-
 /**
  * Return user form based on user attribute.
  * @param user The associative array containing each value of user attribute.
@@ -82,21 +50,10 @@ function getUserForm(user, mode) {
     $form.find('input[type=email]#email').attr('readonly', true);
     // Set website value
     $form.find('input[type=url]#website').attr('value', user['website']);
-    // Checked one of the radio option of Role
-    if (user['role'] == USER_ROLE) {
-      $form.find('input[type=radio][name=role]:nth(0)').attr('checked', true);
-    } else if (user['role'] == TRAINER_ROLE) {
-      $form.find('input[type=radio][name=role]:nth(1)').attr('checked', true);
-    } else if (user['role'] == DEVELOPER_ROLE) {
-      $form.find('input[type=radio][name=role]:nth(2)').attr('checked', true);
-    }
     // Checked email updates checkbox if the user should get email updates
     if (user['email_updates']) {
       $form.find('input[type=checkbox]#email_updates').attr('checked', true);
     }
-    // Set latitude and longitude value
-    $form.find('input[type=text]#lat').attr('value', user['latitude']);
-    $form.find('input[type=text]#lng').attr('value', user['longitude']);
     // Set onclick attribute on button:
     $form.find(':button#submit_form').attr('onclick', 'editUser();');
     $form.find(':button#cancel_form').attr('onclick', 'cancelEditUser();');

users/static/js/user-map.js

@@ -14,24 +14,17 @@
  * @const {int} DELETE_USER_MODE The state when user clicks delete user menu btn.
  * @const {int} DOWNLOAD_MODE The state when user clicks download user list btn.
  * @const {int} REMINDER_MODE The state when user clicks reminder button.
- * @const {int} USER_ROLE The number representation for user role.
- * @const {int} TRAINER_ROLE The number representation for trainer role.
- * @const {int} DEVELOPER_ROLE The number representation for developer role.
  */
 var DEFAULT_MODE = 0;
 var ADD_USER_MODE = 1;
 var EDIT_USER_MODE = 2;
 var DELETE_USER_MODE = 3;
 var DOWNLOAD_MODE = 4;
 var REMINDER_MODE = 5;
-var USER_ROLE = 0;
-var TRAINER_ROLE = 1;
-var DEVELOPER_ROLE = 2;
 
 /**
- * Add users to the respective layer based on user_role.
+ * Add users to the respective layer.
  * @param {object} layer The layer that users will be added to.
- * @param {int} user_role The role of users that will be added.
  * @name L The Class from Leaflet.
  * @property geoJson Property of L class.
  * @property users Property of response object.
@@ -40,22 +33,19 @@ var DEVELOPER_ROLE = 2;
  * @property popupContent Property of properties.
  * @function bindPopup Bind popup to marker
  */
-function addUsers(layer, user_role) {
+function addUsers(layer) {
   $.ajax({
     type: 'POST',
     url: '/users.json',
     dataType: 'json',
-    data: {
-      user_role: user_role
-    },
+
     success: function (response) {
-      var role_icon = getUserIcon(user_role);
       L.geoJson(
           response.users,
           {
             onEachFeature: onEachFeature,
             pointToLayer: function (feature, latlng) {
-              return L.marker(latlng, {icon: role_icon });
+              return L.marker(latlng, {icon: user_icon });
             }
           }).addTo(layer);
     }
@@ -69,14 +59,11 @@ function addUsers(layer, user_role) {
 }
 
 /**
- * Refresh user layer based on the role.
- * Each user who has the same role is grouped on the same layer.
- * @param {int} role The role of the users that its layer is wanted to be refreshed.
+ * Refresh user layer.
  */
-function refreshUserLayer(role) {
-  var layer = getUserLayer(role);
-  layer.clearLayers();
-  addUsers(layer, role);
+function refreshUserLayer() {
+  users_layer.clearLayers();
+  addUsers(users_layer);
 }
 
 /**
@@ -95,7 +82,6 @@ function addUser() {
   var name = $name_input.val();
   var email = $email_input.val();
   var website = $website_input.val();
-  var role = $('input:radio[name=role]:checked').val();
 
   var $email_updates_input = $('#email_updates');
   var email_updates;
@@ -117,7 +103,6 @@ function addUser() {
         name: name,
         email: email,
         website: website,
-        role: role,
         email_updates: email_updates,
         latitude: latitude,
         longitude: longitude
@@ -136,14 +121,8 @@ function addUser() {
         } else {
           //Clear marker
           cancelMarker();
-          // Refresh Layer according to role
-          if (role == USER_ROLE.toString()) {
-            refreshUserLayer(USER_ROLE);
-          } else if (role == TRAINER_ROLE.toString()) {
-            refreshUserLayer(TRAINER_ROLE);
-          } else if (role == DEVELOPER_ROLE.toString()) {
-            refreshUserLayer(DEVELOPER_ROLE);
-          }
+          // Refresh Layer
+          refreshUserLayer();
           activateDefaultState(); // Back to default state
           var add_success_title = 'Information';
           var add_success_info =
@@ -186,10 +165,8 @@ function initializeEditedUser(user, popup_content) {
  * @property marker
  */
 function addEditedUser(user, layer, popup_content) {
-  var role_icon = getUserIcon(user['role']);
   edited_user_marker = L.marker(
-      [user['latitude'], user['longitude']],
-      {icon: role_icon }
+      [user['latitude'], user['longitude']], {icon: user_icon }
   );
   edited_user_marker.addTo(layer);
   edited_user_marker.bindPopup(popup_content).openPopup();
@@ -214,7 +191,6 @@ function editUser() {
   var name = name_input.val();
   var email = email_input.val();
   var website = $('#website').val();
-  var role = $('input:radio[name=role]:checked').val();
   var email_updates;
   if ($('#email_updates').is(':checked')) {
     email_updates = 'true';
@@ -234,7 +210,6 @@ function editUser() {
         name: name,
         email: email,
         website: website,
-        role: role,
         email_updates: email_updates,
         latitude: latitude,
         longitude: longitude

users/templates/html/base.html

@@ -47,14 +47,12 @@
 {{ user_menu_button | safe }}
 {{ information_modal | safe }}
 {{ data_privacy_content | safe }}
-{{ legend | safe }}
 {{ user_form_template | safe }}
 <!-- endblock of all the template -->
 
 <script type="text/javascript">
   var map, base_map, data_privacy_content, data_privacy_control,
-      user_menu_control, user_icon, trainer_icon, developer_icon,
-      estimated_location_circle, current_mode;
+      user_menu_control, user_icon, estimated_location_circle, current_mode;
 
   // Set current_mode to default one
   current_mode = DEFAULT_MODE;
@@ -71,13 +69,9 @@
   // Initialize all icons for marker
   var icons = createAllIcons(
       '{{ user_icons.user }}',
-      '{{ user_icons.trainer }}',
-      '{{ user_icons.developer }}',
       '{{ user_icons.shadow }}'
   );
   user_icon = icons.user_icon;
-  trainer_icon = icons.trainer_icon;
-  developer_icon = icons.developer_icon;
 
   // Create Data Privacy Control
   data_privacy_control = createDataPrivacyControl();

users/templates/html/index.html

@@ -49,8 +49,7 @@ <h3 class="modal-title">Request Edit Link</h3>
 {% endblock %}
 {% block js_container %}
   <script type="text/javascript">
-    var marker_new_user, overlays_layer, users_layer,
-        trainers_layer, developers_layer;
+    var marker_new_user, overlays_layer, users_layer;
 
     $(document).ready(function () {
       //All Users Layer using MarkerCLusterGroup
@@ -61,32 +60,12 @@ <h3 class="modal-title">Request Edit Link</h3>
             iconSize: L.point(40, 40)});
         }
       });
-      trainers_layer = new L.markerClusterGroup({
-        iconCreateFunction: function (cluster) {
-          return L.divIcon({ html: '<div><span>' + cluster.getChildCount() + '</span></div>',
-            className: 'marker-cluster marker-cluster-trainer',
-            iconSize: L.point(40, 40)});
-        }
-      });
-      developers_layer = new L.markerClusterGroup(
-          {
-            iconCreateFunction: function (cluster) {
-              return L.divIcon({ html: '<div><span>' + cluster.getChildCount() + '</span></div>',
-                className: 'marker-cluster marker-cluster-developer',
-                iconSize: L.point(40, 40)});
-            }
-          }
-      );
 
       //Add All Users to the right layer
-      addUsers(users_layer, USER_ROLE);
-      addUsers(trainers_layer, TRAINER_ROLE);
-      addUsers(developers_layer, DEVELOPER_ROLE);
+      addUsers(users_layer);
 
       //Add All users layer to map
       users_layer.addTo(map);
-      developers_layer.addTo(map);
-      trainers_layer.addTo(map);
     })
   </script>
 {% endblock %} <!--endblock of js_container -->