diff --git a/Metronus-Project/metronus_app/admin.py b/Metronus-Project/metronus_app/admin.py index bdb0576..e29d424 100644 --- a/Metronus-Project/metronus_app/admin.py +++ b/Metronus-Project/metronus_app/admin.py @@ -25,6 +25,7 @@ def get_urls(self): ] return my_urls + urls + @classmethod def dashboard(self): """ Returns a JSON which contains the number of tasks per company, diff --git a/Metronus-Project/metronus_app/apps.py b/Metronus-Project/metronus_app/apps.py index 9d9e4e7..e92a868 100644 --- a/Metronus-Project/metronus_app/apps.py +++ b/Metronus-Project/metronus_app/apps.py @@ -2,4 +2,5 @@ class MetronusAppConfig(AppConfig): + """ La documentasió """ name = 'metronus_app' diff --git a/Metronus-Project/metronus_app/model/actor.py b/Metronus-Project/metronus_app/model/actor.py index acff9d0..b40815d 100644 --- a/Metronus-Project/metronus_app/model/actor.py +++ b/Metronus-Project/metronus_app/model/actor.py @@ -29,4 +29,4 @@ def __unicode__(self): return self.identifier def role(self): - return self.type_choices(self.user_type) + return self.type_choices(self.user_type) \ No newline at end of file diff --git a/Metronus-Project/metronus_app/model/company.py b/Metronus-Project/metronus_app/model/company.py index 7a37381..c0d71c1 100644 --- a/Metronus-Project/metronus_app/model/company.py +++ b/Metronus-Project/metronus_app/model/company.py @@ -2,6 +2,8 @@ class Company(models.Model): + """ Esto es una clase del modelo. Totalmente inesperado""" + cif = models.CharField(max_length=9, unique=True) company_name = models.CharField(max_length=100) short_name = models.CharField(max_length=50, unique=True) diff --git a/Metronus-Project/metronus_app/model/companyLog.py b/Metronus-Project/metronus_app/model/companyLog.py index d5b8be4..170da0a 100644 --- a/Metronus-Project/metronus_app/model/companyLog.py +++ b/Metronus-Project/metronus_app/model/companyLog.py @@ -1,6 +1,9 @@ from django.db import models + class CompanyLog(models.Model): + """ Esto es una clase del modelo. Totalmente inesperado""" + cif = models.CharField(max_length=9, unique=True) company_name = models.CharField(max_length=100) registryDate = models.DateTimeField() diff --git a/Metronus-Project/metronus_app/model/department.py b/Metronus-Project/metronus_app/model/department.py index ded8c44..75d8c3e 100644 --- a/Metronus-Project/metronus_app/model/department.py +++ b/Metronus-Project/metronus_app/model/department.py @@ -3,6 +3,8 @@ class Department(models.Model): + """ Esto es una clase del modelo. Totalmente inesperado""" + company_id = models.ForeignKey(Company) name = models.CharField(max_length=50) registryDate = models.DateTimeField(auto_now=True) diff --git a/Metronus-Project/metronus_app/model/employee.py b/Metronus-Project/metronus_app/model/employee.py index 8b4f8f7..9890db7 100644 --- a/Metronus-Project/metronus_app/model/employee.py +++ b/Metronus-Project/metronus_app/model/employee.py @@ -3,6 +3,8 @@ class Employee(Actor): + """ XD """ + price_per_hour = models.FloatField(default=1.0) def __unicode__(self): diff --git a/Metronus-Project/metronus_app/model/employeeLog.py b/Metronus-Project/metronus_app/model/employeeLog.py index 7411084..981a8fc 100644 --- a/Metronus-Project/metronus_app/model/employeeLog.py +++ b/Metronus-Project/metronus_app/model/employeeLog.py @@ -3,6 +3,8 @@ class EmployeeLog(models.Model): + """ Esto es una clase del modelo. Totalmente inesperado""" + employee_id = models.ForeignKey(Employee) event = models.CharField(max_length=1, choices=[('A', 'Alta'), ('B', 'Baja'), ('C', 'Change')], default='A') event_date = models.DateTimeField(auto_now=True) diff --git a/Metronus-Project/metronus_app/model/project.py b/Metronus-Project/metronus_app/model/project.py index fb1fc38..5ed25c9 100644 --- a/Metronus-Project/metronus_app/model/project.py +++ b/Metronus-Project/metronus_app/model/project.py @@ -1,13 +1,16 @@ from django.db import models from metronus_app.model.company import Company + class Project(models.Model): - company_id = models.ForeignKey(Company) - name = models.CharField(max_length=30) - registryDate = models.DateTimeField(auto_now=True) - deleted = models.BooleanField(default=False) - def __unicode__(self): - return self.name - - class Meta: - unique_together = ('name', 'company_id') + """ Esto es una clase del modelo. Totalmente inesperado""" + company_id = models.ForeignKey(Company) + name = models.CharField(max_length=30) + registryDate = models.DateTimeField(auto_now=True) + deleted = models.BooleanField(default=False) + + def __unicode__(self): + return self.name + + class Meta: + unique_together = ('name', 'company_id') diff --git a/Metronus-Project/metronus_app/model/projectDepartmentEmployeeRole.py b/Metronus-Project/metronus_app/model/projectDepartmentEmployeeRole.py index 05152b4..f96270e 100644 --- a/Metronus-Project/metronus_app/model/projectDepartmentEmployeeRole.py +++ b/Metronus-Project/metronus_app/model/projectDepartmentEmployeeRole.py @@ -14,5 +14,8 @@ class ProjectDepartmentEmployeeRole(models.Model): role_id = models.ForeignKey(Role) roleDate = models.DateTimeField(auto_now=True) + def __unicode__(self): + return self.name + class Meta: unique_together = ('projectDepartment_id', 'employee_id','role_id') diff --git a/Metronus-Project/metronus_app/model/task.py b/Metronus-Project/metronus_app/model/task.py index 83faa4c..d088253 100644 --- a/Metronus-Project/metronus_app/model/task.py +++ b/Metronus-Project/metronus_app/model/task.py @@ -4,6 +4,8 @@ class Task(models.Model): + """ Esto es una clase del modelo. Totalmente inesperado""" + name = models.CharField(max_length=30) description = models.CharField(max_length=200) registryDate = models.DateTimeField(auto_now=True) diff --git a/Metronus-Project/metronus_app/templatetags/custom_tags.py b/Metronus-Project/metronus_app/templatetags/custom_tags.py index ba6722e..7c881c2 100644 --- a/Metronus-Project/metronus_app/templatetags/custom_tags.py +++ b/Metronus-Project/metronus_app/templatetags/custom_tags.py @@ -36,6 +36,7 @@ def show_ajax_errors(): @register.simple_tag def converto_to_hours(amount): + """ ¿converto o con berto? XD""" hours = amount//60 minutes = amount % 60 if minutes < 10: diff --git a/Metronus-Project/metronus_app/test/testProjectMetrics.py b/Metronus-Project/metronus_app/test/testProjectMetrics.py index 23d06df..88a853f 100644 --- a/Metronus-Project/metronus_app/test/testProjectMetrics.py +++ b/Metronus-Project/metronus_app/test/testProjectMetrics.py @@ -451,7 +451,7 @@ def create_task_in_projdept(project, department): n_dep = len(departments) # Do the random test 5 times - for k in range(5): + for _ in range(5): # Remove all tasks and time logs TimeLog.objects.all().delete()