Removing trailing whitespaces

Metronus-Project/manage.py

@@ -19,10 +19,10 @@
                 "forget to activate a virtual environment?"
             )
         raise
-    
+
     import django
     django.setup()
-    
+
     argv = sys.argv[1]
 
     if argv == 'populate':

Metronus-Project/metronus_app/admin.py

@@ -27,7 +27,7 @@ def get_urls(self):
 
     def dashboard(self):
         """
-        Returns a JSON which contains the number of tasks per company, 
+        Returns a JSON which contains the number of tasks per company,
         as well as the number of users currently logged
         """
         employees = list(Company.objects.all().annotate(num_emp=Count("actor")).values_list("id", "num_emp"))

Metronus-Project/metronus_app/common_utils.py

@@ -46,7 +46,7 @@ def get_current_employee_or_403(request):
 
 
 def get_authorized_or_403(request):
-    """ 
+    """
     Returns the current administrator,
     or the logged user if they have at least a role higher than Employee on any department/project
     """

Metronus-Project/metronus_app/controllers/administratorController.py

@@ -32,11 +32,11 @@ def edit(request, username):
         })
     elif request.method == "POST":
         # Process the received form
-        
+
         form = AdministratorForm(request.POST)
         if form.is_valid() and check_passwords(form):
             if check_image(form, 'photo'):
-            
+
                 # Update employee data
                 administrator.identifier = form.cleaned_data["identifier"]
                 administrator.phone = form.cleaned_data["phone"]

Metronus-Project/metronus_app/controllers/dashboardController.py

@@ -23,15 +23,15 @@ def view(request):
 def ajax_time_per_project(request):
     """ Devuelve un objeto cuyas claves son las ID de los proyectos y sus valores un objeto {'name': ..., 'time': X} (X en minutos)
 
-    # Parámetros opcionales: 
+    # Parámetros opcionales:
     # start_date - fecha en formato YYYY-MM-DD que indica el inicio de la medición. Por defecto, 30 días antes de la fecha actual.
     # end_date - fecha en formato YYYY-MM-DD que indica el final de la medición. Por defecto, fecha actual.
     # offset - desplazamiento (huso) horario en formato +/-HH:MM - Por defecto +00:00
 
     # Si se proporcionan pero no tienen el formato correcto se lanzará un error HTTP 400 Bad Request
     """
     get_current_admin_or_403(request)
-   
+
     # Get and parse the dates
     start_date = request.GET.get("start_date", str(date.today() - timedelta(days=30)))
     end_date = request.GET.get("end_date", str(date.today()))
@@ -60,7 +60,7 @@ def ajax_time_per_project(request):
             task_id__active=True,
             task_id__projectDepartment_id__project_id=project,
             workDate__range=[start_date, end_date]).aggregate(Sum('duration'))["duration__sum"]
-        if time_total is None: 
+        if time_total is None:
             time_total = 0
 
         data[project.id] = {
@@ -118,4 +118,4 @@ def ajax_tasks_per_project(request):
             'tasks': list(Task.objects.filter(
                 projectDepartment_id__project_id=project).values('id', 'name', 'description'))
         }
-    return JsonResponse(data)
+    return JsonResponse(data)

Metronus-Project/metronus_app/controllers/roleController.py

@@ -10,7 +10,7 @@
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
- 
+
 from metronus_app.common_utils import get_authorized_or_403
 
 
@@ -29,7 +29,7 @@ def manage(request):
         form: formulario RoleManagementForm con los valores iniciales adecuados
 
         errors: array de códigos de error si los hay
-    
+
     template:
         rol_form.html
 
@@ -60,7 +60,7 @@ def manage(request):
 
         form = RoleManagementForm(request.POST)
         if form.is_valid():
-            
+
             result = process_post_form(logged, form)
             if result["ok"]:
                 return HttpResponseRedirect('/employee/view/' + Employee.objects.get(id=form.cleaned_data["employee_id"]).user.username + '/')
@@ -90,7 +90,7 @@ def manage_async(request):
     logged = get_authorized_or_403(request)
 
     if request.method == 'POST':
-        
+
         form = RoleManagementForm(request.POST)
         if form.is_valid():
             result = process_post_form(logged, form)
@@ -180,7 +180,7 @@ def delete(request, role_id):
                 raise PermissionDenied
 
         except ObjectDoesNotExist:
-            raise PermissionDenied    
+            raise PermissionDenied
 
     employee_username = role.employee_id.user.username
     role.delete()

Metronus-Project/metronus_app/controllers/timeLogController.py

@@ -168,7 +168,7 @@ def check_permission_for_task(employee, task):
                                                            projectDepartment_id=task.projectDepartment_id)
         return res.count() > 0
     return False
-    
+
 
 def check_role_for_task(employee, task):
     """Comprobacion para saber si el empleado es un mando superior y

Metronus-Project/metronus_app/forms/registrationForm.py

@@ -12,7 +12,7 @@ class RegistrationForm(Form):
     company_email = forms.EmailField(label=_("company_email"))
     company_phone = forms.CharField(label=_("company_phone"), max_length=15)
     logo = forms.ImageField(label=_("logo"), required=False)
-    
+
     # User (Account data)
     username = forms.CharField()
     admin_email = forms.EmailField(label=_("admin_email"))

Metronus-Project/metronus_app/model/department.py

@@ -7,6 +7,6 @@ class Department(models.Model):
 	active=models.BooleanField(default=True)
 	def __unicode__(self):
 		return self.name
-		
+
 	class Meta:
 		unique_together = ('name', 'company_id')

Metronus-Project/metronus_app/model/employee.py

@@ -1,7 +1,7 @@
 from metronus_app.model.actor import Actor
 from django.db import models
 
-class Employee(Actor): 
+class Employee(Actor):
     price_per_hour=models.FloatField(default=1.0)
     def __unicode__(self):
         return self.identifier

Metronus-Project/metronus_app/model/timeLog.py

@@ -10,7 +10,7 @@ class TimeLog(models.Model):
     description = models.CharField(max_length=200, blank=False, null=False)
     registryDate = models.DateTimeField(auto_now=True)
     workDate = models.DateTimeField()
-    
+
 	#duration in minutes
     duration = models.PositiveSmallIntegerField(default=1, blank=False, null=False)
 
@@ -21,4 +21,4 @@ class TimeLog(models.Model):
     employee_id = models.ForeignKey(Employee)
 
     def __unicode__(self):
-        return self.task_id + " - " + self.workDate + " - " + self.description
+        return self.task_id + " - " + self.workDate + " - " + self.description

Metronus-Project/metronus_app/templatetags/custom_tags.py

@@ -84,9 +84,9 @@ def is_employee(actor):
     for role in ProjectDepartmentEmployeeRole.objects.filter(employee_id=actor.id):
         if role.role_id.name == 'EMPLOYEE':
             return True
-            
+
     return False
-    
+
 
 @register.assignment_tag
 def is_project_manager(actor):
@@ -96,7 +96,7 @@ def is_project_manager(actor):
     for role in ProjectDepartmentEmployeeRole.objects.filter(employee_id=actor.id):
         if role.role_id.name == 'PROJECT_MANAGER':
             return True
-    
+
     return False
 
 
@@ -132,5 +132,5 @@ def is_team_manager(actor):
     for role in ProjectDepartmentEmployeeRole.objects.filter(employee_id=actor.id):
         if role.role_id.name == 'TEAM_MANAGER':
             return True
-            
+
     return False

Metronus-Project/metronus_app/test/testDepartment.py

@@ -89,7 +89,7 @@ def setUpTestData(cls):
         Department.objects.create(name="dep2", active=True, company_id=company1)
         Department.objects.create(name="dep3", active=False, company_id=company1)
         Department.objects.create(name="dep3", active=True, company_id=company2)
-        
+
         proj1 = Project.objects.create(name="TestProject", deleted=False, company_id=company1)
         Project.objects.create(name="TestProject2", deleted=False, company_id=company1)
         pd1 = ProjectDepartment.objects.create(

Metronus-Project/metronus_app/test/testRole.py

@@ -234,7 +234,7 @@ def test_get_form_user_ok(self):
         self.assertTrue("department_id" not in form.initial)
         self.assertTrue("project_id" not in form.initial)
         self.assertTrue("role_id" not in form.initial)
-    
+
     def test_get_form_existing_role_positive(self):
         """
         With proper roles, edit the role of an employee
@@ -419,7 +419,7 @@ def test_post_new_role_admin_duplicated(self):
         """
         Try adding a duplicate role for an user
         """
-        
+
         c = Client()
         c.login(username="admin1", password="123456")
 

Metronus-Project/metronus_app/test/testTimeLog.py

@@ -97,7 +97,7 @@ def test_create_timelog_positive_2(self):
 
         self.assertEquals(logs_before + 1, logs_after)
 
-        
+
 
     def test_create_timelog_positive_3(self):
         """ Creates a timelog twice with the same description, causing the log to be update"""

Metronus-Project/populate_database.py

@@ -252,16 +252,16 @@ def basicLoad():
     )
     ge1=GoalEvolution.objects.create(
         task_id=task3,
-        
+
         actor_id = emp8,
         production_goal=9.0,
         goal_description="kgs",
         price_per_unit=3.0
         )
-    
+
     ge2=GoalEvolution.objects.create(
         task_id=task3,
-        
+
         actor_id = emp8,
         production_goal=4.0,
         goal_description="kgs",
@@ -295,7 +295,7 @@ def populate_roles():
     Role.objects.create(name="EXECUTIVE", tier=50)
     # El jefe de proyecto
     Role.objects.create(name="PROJECT_MANAGER", tier=40)
-    # El jefe de equipo 
+    # El jefe de equipo
     Role.objects.create(name="TEAM_MANAGER", tier=30)
     # El coordinador del departamento
     Role.objects.create(name="COORDINATOR", tier=20)
@@ -310,4 +310,4 @@ def populate_database():
     """
     This is called by python3 manage.py populate
     """
-    basicLoad()
+    basicLoad()