Added Prices Under Network and Clear Search for Subscribers

cloud/endagaweb/forms/dashboard_forms.py

@@ -10,15 +10,16 @@
 
 import datetime
 
+import pytz
+from crispy_forms.bootstrap import StrictButton, FieldWithButtons
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Layout, Submit, Field
 from django import forms
+from django.contrib.auth.forms import PasswordChangeForm, PasswordResetForm
+from django.contrib.auth.models import User
+from django.core import urlresolvers
 from django.db.models import Value
 from django.db.models.functions import Coalesce
-from django.core import urlresolvers
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Submit, Field
-from crispy_forms.bootstrap import StrictButton, FieldWithButtons
-from django.contrib.auth.forms import PasswordChangeForm
-import pytz
 
 from ccm.common.currency import CURRENCIES
 from endagaweb import models
@@ -190,7 +191,7 @@ def __init__(self, *args, **kwargs):
         self.helper.form_class = 'profile-form'
         update_button = StrictButton('Update', css_class='btn-default',
                                      type='submit')
-        self.helper.layout =  Layout(FieldWithButtons('notify_numbers', update_button))
+        self.helper.layout = Layout(FieldWithButtons('notify_numbers', update_button))
 
 
 class SubVacuumForm(forms.Form):
@@ -368,3 +369,29 @@ def __init__(self, *args, **kwargs):
         self.helper.form_action = '/dashboard/staff/tower-monitoring'
         self.helper.add_input(Submit('submit', 'Select'))
         self.helper.layout = Layout('tower')
+
+
+class UserSearchForm(forms.Form):
+    """Crispy search form on /dashboard/subscribers."""
+    query = forms.CharField(required=False, label="",
+                            widget=forms.TextInput(
+                                attrs={'placeholder':
+                                           '[email protected]'}))
+
+    def __init__(self, sender, *args, **kwargs):
+        self.helper = FormHelper()
+        self.helper.form_id = 'id-SearchForm'
+        self.helper.form_method = 'get'
+        self.helper.form_action = '/dashboard/user/management'
+        search_button = StrictButton('Search', css_class='btn-default',
+                                     type='submit')
+        self.helper.layout = Layout(FieldWithButtons('query', search_button))
+        super(UserSearchForm, self).__init__(*args, **kwargs)
+
+
+
+class PasswordResetRequestForm(PasswordResetForm):
+    email = forms.CharField(label=("Email"), max_length=254)
+    class Meta:
+        model = User
+        fields = ("email")

cloud/endagaweb/models.py

@@ -59,6 +59,43 @@
     'outside_call', 'outside_sms', 'local_call', 'local_sms',
 )
 
+PERMISSIONS = (
+                # User Management
+                ('user_management', 'User Management'),
+
+                # Towers
+                ('view_bts', 'View Tower'),
+                ('edit_bts', 'Manage Tower'),
+
+                # Subscriber
+                ('adjust_credit', 'Adjust Credit(Subscriber)'),
+                ('view_subscriber', 'View Subscriber'),
+                ('edit_subscriber', 'Manage Subscriber'),
+
+                # Network
+                ('view_network', 'View Network'),
+                ('edit_network', 'Manage Network'),
+                ('view_notification', 'View Notification(Network)'),
+                ('edit_notification', 'Manage Notification(Network)'),
+                ('view_denomination', 'View Denomination(Network)'),
+                ('edit_denomination', 'Manage Denomination(Network)'),
+
+                # In Tower/Network/Subscriber
+                ('send_sms', 'Broadcast SMS'),
+
+                # Graphs
+                ('view_graph', 'View Graph'),
+
+                # Reports
+                ('view_report', 'View Report'),
+                ('download_graph', 'Download Report'),
+
+                # Activity
+                ('view_activity', 'View Activity'),
+                ('download_activity', 'Download Activity(Report)'),
+
+            )
+
 
 class UserProfile(models.Model):
     """UserProfiles extend the default Django User models.
@@ -71,7 +108,7 @@ class UserProfile(models.Model):
     timezone_choices = [(v, v) for v in pytz.common_timezones]
     timezone = models.CharField(max_length=50, default='UTC',
                                 choices=timezone_choices)
-
+    role = models.CharField(max_length=20, default='Cloud Admin')
     # A UI kludge indicate which network a user is currently viewing
     # Important: This is not the only network a User is associated with
     # because a user may have permissions on other Network instances.
@@ -103,7 +140,9 @@ def new_user_hook(sender, instance, created, **kwargs):
         """
         if created and instance.username != settings.ANONYMOUS_USER_NAME:
             profile = UserProfile.objects.create(user=instance)
-            network = Network.objects.create()
+            # Add explicit name to avoid duplicate names when
+            # running setup_test_db
+            network = Network.objects.create(name='Network_%s' % (instance.pk,))
             network.auth_group.user_set.add(instance)
             network.save()
             # Make this the users currently selected network
@@ -296,6 +335,9 @@ class BTS(models.Model):
     #none is unknown or invalid
     channel = models.IntegerField(null=True, blank=True)
 
+    class Meta:
+        default_permissions = ()
+
     def __unicode__(self):
         return "BTS(%s, %s, last active: %s)" % (
             self.uuid, self.inbound_url, self.last_active)
@@ -792,6 +834,9 @@ class UsageEvent(models.Model):
     timespan = models.DecimalField(null=True, max_digits=7, decimal_places=1)
     date_synced = models.DateTimeField(auto_now_add=True)
 
+    class Meta:
+        default_permissions = ()
+
     def voice_sec(self):
         """Gets the number of seconds for this call.
 
@@ -980,9 +1025,8 @@ class Network(models.Model):
     environment = models.TextField(default="default")
 
     class Meta:
-        permissions = (
-            ('view_network', 'View network'),
-        )
+        default_permissions = ()
+        permissions = PERMISSIONS
 
     @property
     def api_token(self):
@@ -1432,14 +1476,14 @@ def create_auth(sender, instance, created, **kwargs):
         authenticate.
         """
         if not instance.auth_group or not instance.auth_user:
-            instance.auth_group, created_group = Group.objects.get_or_create(name='network_%s'
-                % instance.pk)
+            instance.auth_group, created_group = Group.objects.get_or_create(name='%s_GROUP_%s' %
+                                                                                  (instance.name, instance.pk))
             if created_group:
                 assign_perm('view_network', instance.auth_group, instance)
 
             post_save.disconnect(UserProfile.new_user_hook, sender=User)
-            instance.auth_user, created_user = User.objects.get_or_create(username='network_%s'
-                % instance.pk)
+            instance.auth_user, created_user = User.objects.get_or_create(username='%s_USER_%s' %
+                                                                                   (instance.name, instance.pk))
             if created_user:
                 Token.objects.create(user=instance.auth_user)
                 instance.auth_group.user_set.add(instance.auth_user)