From bb35c0a7546440247dad47f57d748259d0e9a744 Mon Sep 17 00:00:00 2001
From: Madhusudan.C.S
Date: Fri, 14 Jan 2011 00:59:09 +0530
Subject: Purging the repository for the new set of changes by Nishanth.
---
taskapp/__init__.py | 0
taskapp/admin.py | 9 -
taskapp/events/__init__.py | 0
taskapp/events/request.py | 130 ------
taskapp/events/task.py | 271 ------------
taskapp/events/user.py | 56 ---
taskapp/forms/__init__.py | 0
taskapp/forms/task.py | 107 -----
taskapp/forms/user.py | 65 ---
taskapp/management/__init__.py | 1 -
taskapp/management/commands/__init__.py | 0
taskapp/management/commands/seed_db.py | 58 ---
taskapp/models.py | 183 --------
taskapp/tests.py | 23 -
taskapp/utilities/__init__.py | 0
taskapp/utilities/helper.py | 8 -
taskapp/utilities/notification.py | 300 -------------
taskapp/utilities/request.py | 62 ---
taskapp/utilities/task.py | 37 --
taskapp/utilities/user.py | 17 -
taskapp/views/__init__.py | 1 -
taskapp/views/task.py | 726 --------------------------------
taskapp/views/user.py | 347 ---------------
23 files changed, 2401 deletions(-)
delete mode 100644 taskapp/__init__.py
delete mode 100644 taskapp/admin.py
delete mode 100644 taskapp/events/__init__.py
delete mode 100644 taskapp/events/request.py
delete mode 100644 taskapp/events/task.py
delete mode 100644 taskapp/events/user.py
delete mode 100644 taskapp/forms/__init__.py
delete mode 100644 taskapp/forms/task.py
delete mode 100644 taskapp/forms/user.py
delete mode 100644 taskapp/management/__init__.py
delete mode 100644 taskapp/management/commands/__init__.py
delete mode 100644 taskapp/management/commands/seed_db.py
delete mode 100644 taskapp/models.py
delete mode 100644 taskapp/tests.py
delete mode 100644 taskapp/utilities/__init__.py
delete mode 100644 taskapp/utilities/helper.py
delete mode 100644 taskapp/utilities/notification.py
delete mode 100644 taskapp/utilities/request.py
delete mode 100644 taskapp/utilities/task.py
delete mode 100644 taskapp/utilities/user.py
delete mode 100644 taskapp/views/__init__.py
delete mode 100644 taskapp/views/task.py
delete mode 100644 taskapp/views/user.py
(limited to 'taskapp')
diff --git a/taskapp/__init__.py b/taskapp/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/taskapp/admin.py b/taskapp/admin.py
deleted file mode 100644
index d7d10d2..0000000
--- a/taskapp/admin.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.contrib import admin
-
-from pytask.taskapp.models import Profile, Task, Comment, Notification, Request
-
-admin.site.register(Profile)
-admin.site.register(Task)
-admin.site.register(Comment)
-admin.site.register(Notification)
-admin.site.register(Request)
diff --git a/taskapp/events/__init__.py b/taskapp/events/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/taskapp/events/request.py b/taskapp/events/request.py
deleted file mode 100644
index d69f717..0000000
--- a/taskapp/events/request.py
+++ /dev/null
@@ -1,130 +0,0 @@
-from datetime import datetime
-from pytask.taskapp.models import Profile
-from pytask.taskapp.events.task import addReviewer
-from pytask.taskapp.events.user import changeRole
-from pytask.taskapp.utilities.notification import create_notification
-
-def reply_to_request(request_obj, reply, replied_by):
- """
- makes a request replied with the given reply.
- arguments:
- request_obj - Request object for which change is intended
- reply - a boolean value to be given as reply (True/False)
- replied_by - the user object who replies to the request
- """
- if not request_obj.is_replied:
- request_obj.reply = reply
- request_obj.is_replied = True
- request_obj.reply_date = datetime.now()
- request_obj.replied_by = replied_by
- request_obj.save()
-
- if request_obj.role == "PY":
- ## note that we are not doing any check. we make requests invalid when an event like closing task happens.
- task = request_obj.task
- pynts = request_obj.pynts
- receiving_user = request_obj.receiving_user
- requested_by = request_obj.sent_by
- create_notification(request_obj.role, receiving_user, replied_by, reply, task, request_obj.remarks, requested_by, receiving_user, pynts)
- if receiving_user != requested_by:
- create_notification(request_obj.role, requested_by, replied_by, reply, task, request_obj.remarks, requested_by, receiving_user, pynts)
-
- elif request_obj.role == "MT":
- task = request_obj.task
- requested_by = request_obj.sent_by
- if reply:
- ## tell the replied user that he is reviewer for this task and give him learn more link
- create_notification("NT", request_obj.replied_by, task=task)
-
- ## now check if there are such similar requests and mark them as invalid
- ## they cannot be of type PY and so we can use the replied_by to get requests
- pending_requests = replied_by.request_sent_to.filter(is_valid=True, is_replied=False, role="MT",task=task)
- for req in pending_requests:
- create_notification("MT", req.sent_by, replied_by, False, task=req.task, remarks = "User has already accepted one such request and is a reviewer.", requested_by = req.sent_by)
- req.is_valid = False
- req.save()
-
- ## alert all the reviewers including who made request and all assigned users
- for a_reviewer in task.reviewers.all():
- create_notification(request_obj.role, a_reviewer, replied_by, True, task, request_obj.remarks, requested_by)
- for a_user in task.assigned_users.all():
- create_notification(request_obj.role, a_user, replied_by, True, task, request_obj.remarks, requested_by)
-
- addReviewer(task, request_obj.replied_by)
- else:
- ## tell the requested user that his request was rejected due to these reasons.
- create_notification(request_obj.role, requested_by, replied_by, False, task, request_obj.remarks, requested_by)
-
- elif request_obj.role == "DV":
- if reply:
- ## here we look for requests that are similar => requesting for DV and make them invalid
- ## also we drop a notification to user who made request
- pending_requests = request_obj.replied_by.request_sent_to.filter(is_valid=True,is_replied=False,role="DV")
- for req in pending_requests:
- req.is_valid = False
- req.save()
- create_notification(role = req.role, sent_to = req.sent_by, sent_from = replied_by, reply = False, \
- remarks = "User has accepted a similar request and has rights same or higher privileged than the request", \
- requested_by = req.sent_by )
-
- ## tell only the user who made him a DV
- ## drop a welcome message to that fucker
- create_notification(request_obj.role, request_obj.sent_by, request_obj.replied_by, reply, requested_by=request_obj.sent_by)
- create_notification("ND", request_obj.replied_by, requested_by=request_obj.sent_by)
- changeRole(role=request_obj.role, user=request_obj.replied_by)
-
- else:
- create_notification(request_obj.role, request_obj.sent_by, request_obj.replied_by, reply, remarks=request_obj.remarks, requested_by=request_obj.sent_by)
-
- elif request_obj.role == "MG":
- if reply:
- ## tell all the MG and AD
- alerting_users = Profile.objects.filter(user__is_active=True).exclude(rights="CT").exclude(rights="DV")
- for a_profile in alerting_users:
- create_notification(request_obj.role, a_profile.user, request_obj.replied_by, reply, requested_by=request_obj.sent_by)
-
- ## here we look for requests that less or similar => requesting for DV or MG and make them invalid
- ## also we drop a notification to user who made request
- active_requests = request_obj.replied_by.request_sent_to.filter(is_valid=True,is_replied=False)
- pending_requests = active_requests.filter(role="DV") | active_requests.filter(role="MG")
- for req in pending_requests:
- req.is_valid = False
- req.save()
- create_notification(role = req.role, sent_to = req.sent_by, sent_from = replied_by, reply = False, \
- remarks = "User has accepted a similar request and has rights same or higher privileged than the request", \
- requested_by = req.sent_by )
-
- ## drop a welcome message to that fucker
- create_notification("NG", request_obj.replied_by, requested_by=request_obj.sent_by)
- changeRole(role=request_obj.role, user=request_obj.replied_by)
-
- else:
- create_notification(request_obj.role, request_obj.sent_by, request_obj.replied_by, reply, remarks=request_obj.remarks, requested_by=request_obj.sent_by)
-
- elif request_obj.role == "AD":
- if reply:
-
- ## here we look for requests that less or similar => requesting for DV or MG or AD and make them invalid
- ## also we drop a notification to user who made request
- active_requests = request_obj.replied_by.request_sent_to.filter(is_valid=True,is_replied=False)
- pending_requests = active_requests.filter(role="DV") | active_requests.filter(role="MG") | active_requests.filter(role="AD")
- for req in pending_requests:
- req.is_valid = False
- req.save()
- create_notification(role = req.role, sent_to = req.sent_by, sent_from = replied_by, reply = False, \
- remarks = "User has accepted a similar request and has rights same or higher privileged than the request", \
- requested_by = req.sent_by )
- ## tell all the AD
- alerting_users = Profile.objects.filter(user__is_active=True).filter(rights="AD")
- for a_profile in alerting_users:
- create_notification(request_obj.role, a_profile.user, request_obj.replied_by, reply, requested_by=request_obj.sent_by)
-
- ## drop a welcome message to that fucker
- create_notification("NA", request_obj.replied_by, requested_by=request_obj.sent_by)
- changeRole(role=request_obj.role, user=request_obj.replied_by)
-
- else:
- create_notification(request_obj.role, request_obj.sent_by, request_obj.replied_by, reply, remarks=request_obj.remarks, requested_by=request_obj.sent_by)
-
- return True #Reply has been added successfully
- return False #Already replied
diff --git a/taskapp/events/task.py b/taskapp/events/task.py
deleted file mode 100644
index 77ad361..0000000
--- a/taskapp/events/task.py
+++ /dev/null
@@ -1,271 +0,0 @@
-from datetime import datetime
-from pytask.taskapp.models import Profile, Task, Comment, Map
-from pytask.taskapp.utilities.task import getTask
-from pytask.taskapp.utilities.request import create_request
-from pytask.taskapp.utilities.helper import get_key
-from pytask.taskapp.utilities.notification import create_notification
-
-def publishTask(task, rem_reviewers=True, rem_comments=True):
- """ set the task status to open """
-
- # if task.sub_type == 'D':
- # deps, subs = task.map_subs.all(), []
- #else:
- # subs, deps = task.map_subs.all(), []
-
- task = getTask(task.id)
- if task.subs or any(map(lambda t:t.status!="CM",task.deps)):
- task.status = "LO"
- else:
- task.status = "OP"
-
- if rem_reviewers:
- task.reviewers.clear()
- task.reviewers.add(task.created_by)
-
- if rem_comments:
- task.comment_set.update(is_deleted=True)
- task.comment_set.update(deleted_by=task.created_by)
-
- task.published_datetime = datetime.now()
- task.save()
-
- pending_requests = task.request_task.filter(is_valid=True, is_replied=False)
- pending_requests.update(is_valid=False)
-
- return task
-
-def addSubTask(main_task, sub_task):
- """ add the task to subs attribute of the task and update its status.
- sub task can be added only if a task is in UP/OP/LO state.
- """
-
- ## Shall modify after talking to pr about subtasks
- ## I think i might even remove the concept of subtasks
-
- main_task.sub_type = "S"
- main_task.save()
-
- try:
- mapobj = Map.objects.get(main=main_task)
- except Map.DoesNotExist:
- mapobj = Map()
- mapobj.main = main_task
- mapobj.save()
- mapobj.subs.add(sub_task)
- mapobj.save()
-
- sub_tasks = getTask(main_task.id).subs
- if main_task.status == "OP":
- if any(map(lambda t:t.status!="CM",sub_tasks)):
- main_task.status = "LO"
- else:
- "CM"
- main_task.save()
-
-def addDep(main_task, dependency):
- """ add the dependency task to deps attribute of the task.
- update the status of main_task accordingly.
- note that deps can be added only if task is in UP/OP/LO state.
- And also if the task doesn't have any subs.
- """
-
- main_task.sub_type = "D"
- main_task.save()
-
- try:
- mapobj = Map.objects.get(main=main_task)
- except Map.DoesNotExist:
- mapobj = Map()
- mapobj.main = main_task
- mapobj.save()
-
- mapobj.subs.add(dependency)
- mapobj.save()
-
- deps = getTask(main_task.id).deps
-
- if main_task.status in ["OP", "LO"]:
- if all(map(lambda t:t.status=="CM",deps)):
- main_task.status = "OP"
- else:
- main_task.status = "LO"
-
- main_task.save()
-
-def reqReviewer(task, reviewer, req_by):
- """ create a request object with role as MT.
- """
-
- create_request(sent_by=req_by, role="MT", sent_to=reviewer, task=task)
-
-def addReviewer(task,reviewer):
- """ add the reviewer to reviewers list of the task """
-
- task.reviewers.add(reviewer)
- task.save()
- return task
-
-def createTask(title,desc,created_by,pynts):
- """ creates a bare minimum task with title, description and pynts.
- the creator of the task will be assigned as a reviewer for the task.
- """
-
- while True:
- id = get_key()
- try:
- task = Task.objects.get(id__iexact=id)
- continue
- except Task.DoesNotExist:
- break
-
- try:
- task = Task.objects.exclude(status="DL").get(title__iexact=title)
- return None
- except:
- task = Task(title=title)
-
- task.id = id
- task.desc = desc
- task.created_by = created_by
- task.pynts = pynts
- task.creation_datetime = datetime.now()
- task.published_datetime = datetime.now()
- task.save()
- return task
-
-def addClaim(task, message, user):
- """ add claim data to the database if it does not exist
- and also update the claimed users field of the task.
- """
-
- task.claimed_users.add(user)
- task.save()
-
- pending_reqs = user.request_sent_to.filter(is_replied=False, is_valid=True, role="MT", task=task).all()
- for req in pending_reqs:
- req.is_valid = False
- req.save()
- user_url = '%s'%(user.id, user.username)
- reason = "User has claimed the task and hence cannot be a reviewer and this request was made invalid."
- create_notification("MT", req.sent_by, user, task=task, reply=False, remarks=reason, requested_by=req.sent_by)
-
- for a_reviewer in task.reviewers.all():
- create_notification("CL", a_reviewer, user, task=task, remarks=message)
-
-def assignTask(task, added_user, assigned_by):
- """ check for the status of task and assign it to the particular user """
-
- if task.status in ['OP', 'WR']:
- task.assigned_users.add(added_user)
- task.claimed_users.remove(added_user)
- task.status = "WR"
- task.save()
-
- create_notification("AU", added_user, assigned_by, task=task)
-
-
-def updateTask(task, title=None, desc=None, pynts=None, tags_field=None):
- """ update the property accordingly.
- while updating title, check for uniqueness of title.
- return None if any error.
- """
-
- if title:
- try:
- task.title = title
- task.save()
- except Task.IntegrityError:
- return None
- if desc:task.desc = desc
- if pynts:task.pynts = pynts
- if tags_field:task.tags_field = tags_field
- task.save()
- return task
-
-def removeTask(main_task, sub_task):
- """ get the corresponding map object and remove the sub_task.
- """
-
- mapobj = Map.objects.get(main=main_task)
- mapobj.subs.remove(sub_task)
- mapobj.save()
-
-def removeUser(main_task, rem_user, removed_by, reason=None):
- """ right now, just remove the user from the list of assigned_users.
- """
-
- main_task.assigned_users.remove(rem_user)
- main_task.save()
-
- ## TODiscuss : when a user is kicked off, his pending requests for pynts is made invalid
- rem_user.request_receiving_user.filter(task=main_task,role="PY",is_valid=True,is_replied=False).update(is_valid=False)
-
- create_notification("RU", rem_user, removed_by, task=main_task, remarks=reason)
- ## TODO : create notification to the victim
-
-def assignPynts(task, given_by, given_to, points):
- """ make a proper request object.
- """
-
- create_request(sent_by=given_by, role="PY", task=task, receiving_user=given_to, pynts=points )
-
-def completeTask(task, marked_by):
- """ set the status of task as completed.
- We dont have to inform parent tasks.
- That part is taken care by getTask method.
- """
-
- task.status = "CM"
- task.save()
-
- pending_requests = task.request_task.filter(is_replied=False)
- pending_requests.update(is_valid=False)
-
- ## generate notification appropriately using marked_by
- ## we also have to mark unread requests as invalid
-
- for a_user in task.assigned_users.all():
- create_notification(role="CM", sent_to=a_user, sent_from=marked_by, task=task)
-
- for a_user in task.claimed_users.all():
- create_notification(role="CM", sent_to=a_user, sent_from=marked_by, task=task)
-
- for a_reviewer in task.reviewers.all():
- create_notification(role="CM", sent_to=a_reviewer, sent_from=marked_by, task=task)
-
-def closeTask(task, closed_by, reason=None):
- """ set the status of task as CD.
- generate notifications accordingly.
- """
-
- task.status = "CD"
- task.save()
-
- pending_requests = task.request_task.filter(is_replied=False)
- pending_requests.update(is_valid=False)
-
- ## generate notifications here
-
- for a_user in task.assigned_users.all():
- create_notification(role="CD", sent_to=a_user, sent_from=closed_by, task=task, remarks=reason)
-
- for a_user in task.claimed_users.all():
- create_notification(role="CD", sent_to=a_user, sent_from=closed_by, task=task, remarks=reason)
-
- for a_reviewer in task.reviewers.all():
- create_notification(role="CD", sent_to=a_reviewer, sent_from=closed_by, task=task, remarks=reason)
-
-def deleteTask(task, deleted_by, reason=None):
- """ set the task status as DL
- notify all its other viewers about the deleting of task.
- """
-
- task.status = "DL"
- task.save()
-
- pending_requests = task.request_task.filter(is_replied=False,is_valid=True)
- pending_requests.update(is_valid=False)
-
- for a_reviewer in task.reviewers.exclude(id=deleted_by.id):
- create_notification("DL", sent_to=a_reviewer, sent_from=deleted_by, task=task, remarks=reason)
diff --git a/taskapp/events/user.py b/taskapp/events/user.py
deleted file mode 100644
index 754cab0..0000000
--- a/taskapp/events/user.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from django.contrib.auth.models import User
-from pytask.taskapp.models import Profile, Task, Comment
-
-""" A collection of helper methods. note that there is no validation done here.
-we take care of validation and others checks in methods that invoke these methods.
-"""
-
-def updateProfile(user_profile, properties):
- """ updates the given properties in the profile for a user.
- args:
- user_profile : a profile object
- properties : a dictionary with attributes to set as keys and corresponding values
- """
-
- for attr,value in properties.items():
- user_profile.__setattr__(attr,value)
- user_profile.save()
-
-def createUser(username,email,password,dob,gender):
- """ create a user and create a profile and update its properties
- args:
- username : a username that does not exist
- email : a valid email
- password : a password
- dob : a date object
- gender : u'M'/u'F'
- """
-
- try:
- user = User.objects.get(username=username)
- return user
- except:
- user = User(username=username, email=email)
- user.set_password(password)
- user.save()
- properties = {'dob':dob, 'gender':gender}
- user_profile = Profile(user=user)
- updateProfile(user_profile, properties)
- return user
-
-def createSuUser(username,email,password,dob,gender):
- """ create user using createUser method and set the is_superuser flag """
-
- su_user = createUser(username,email,password,dob,gender)
- su_user.is_staff = True
- su_user.is_superuser = True
- su_user.save()
- return su_user
-
-def changeRole(role, user):
- """ change the status of user to role.
- """
-
- user_profile = user.get_profile()
- user_profile.rights = role
- user_profile.save()
diff --git a/taskapp/forms/__init__.py b/taskapp/forms/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/taskapp/forms/task.py b/taskapp/forms/task.py
deleted file mode 100644
index ef294a2..0000000
--- a/taskapp/forms/task.py
+++ /dev/null
@@ -1,107 +0,0 @@
-from django import forms
-from pytask.taskapp.models import Task, WorkReport
-
-class TaskCreateForm(forms.ModelForm):
- class Meta:
- model = Task
- fields = ['title', 'desc', 'tags_field', 'pynts']
- #publish = forms.BooleanField(required=False)
-
- def clean_title(self):
- data = self.cleaned_data['title'].strip()
- try:
- Task.objects.exclude(status="DL").get(title__iexact=data)
- raise forms.ValidationError("Another task with same title exists")
- except Task.DoesNotExist:
- return data
-
- def clean_desc(self):
- data = self.cleaned_data['desc'].strip()
- if not data:
- raise forms.ValidationError("Enter some description for the task")
-
- return data
-
-class EditTaskForm(forms.ModelForm):
- class Meta:
- model = Task
- fields = ['title', 'desc', 'tags_field', 'pynts']
-
- def clean_desc(self):
- data = self.cleaned_data['desc'].strip()
- if not data:
- raise forms.ValidationError("Enter some description for the task")
-
- return data
-
- def clean_title(self):
- data = self.cleaned_data['title'].strip()
- try:
- prev_task = Task.objects.exclude(status="DL").get(title__iexact=data)
- if prev_task.id != self.instance.id:
- raise forms.ValidationError("Another task with same title exists")
- else:
- return data
- except Task.DoesNotExist:
- return data
-
-def AddReviewerForm(choices,instance=None):
- """ return a form object with appropriate choices """
-
- class myform(forms.Form):
- reviewer = forms.ChoiceField(choices=choices, required=True)
- form = myform(instance) if instance else myform()
- return form
-
-class ClaimTaskForm(forms.Form):
- message = forms.CharField(label="Proposal")
-
- def clean_message(self):
- data = self.cleaned_data['message'].strip()
- if not data:
- raise forms.ValidationError('Enter something as a proposal')
- return data
-
-
-def ChoiceForm(choices, instance=None):
- """ return a form object with appropriate choices """
-
- class myform(forms.Form):
- choice = forms.ChoiceField(choices=choices, required=True)
- form = myform(instance) if instance else myform()
- return form
-
-def AddTaskForm(task_choices, is_plain=False):
- """ if is_plain is true, it means the task has no subs/deps.
- so we also give a radio button to choose between subs and dependencies.
- else we only give choices.
- """
-
- class myForm(forms.Form):
- if is_plain:
- type_choices = [('S','Subtasks'),('D','Dependencies')]
- type = forms.ChoiceField(type_choices, widget=forms.RadioSelect)
-
- task = forms.ChoiceField(choices=task_choices)
- return myForm()
-
-def AssignPyntForm(choices, instance=None):
-
- class myForm(forms.Form):
- user = forms.ChoiceField(choices=choices, required=True)
- pynts = forms.IntegerField(min_value=0, required=True, help_text="Choose wisely since it cannot be undone.")
- return myForm(instance) if instance else myForm()
-
-def RemoveUserForm(choices, instance=None):
-
- class myForm(forms.Form):
- user = forms.ChoiceField(choices=choices, required=True)
- reason = forms.CharField(min_length=1, required=True)
- return myForm(instance) if instance else myForm()
-
-class WorkReportForm(forms.ModelForm):
-
- class Meta:
- model = WorkReport
- fields = ['remarks', 'attachment']
-
diff --git a/taskapp/forms/user.py b/taskapp/forms/user.py
deleted file mode 100644
index 4cde155..0000000
--- a/taskapp/forms/user.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/python2.5
-
-import os
-import PIL
-
-from pytask.taskapp.utilities.helper import get_key
-
-from django import forms
-from pytask.taskapp.models import GENDER_CHOICES, Profile
-from registration.forms import RegistrationFormUniqueEmail
-from registration.models import RegistrationProfile
-from pytask.taskapp.utilities.notification import create_notification
-
-class UserProfileEditForm(forms.ModelForm):
- """Form used to edit the profile of a user"""
-
- class Meta:
- model = Profile
- exclude = ('user','rights','dob','pynts')
-
- def clean_photo(self):
- uploaded_photo = self.data.get('photo', None)
- prev_photo = self.instance.photo
- if uploaded_photo:
- if uploaded_photo.size > 1048576:
- raise forms.ValidationError('Images only smaller than 1MB allowed')
- tmp_im_path = '/tmp/'+get_key()
- tmp_file = open(tmp_im_path, 'w')
- tmp_file.write(uploaded_photo.read())
- tmp_file.close()
- try:
- PIL.Image.open(tmp_im_path)
- except IOError:
- raise forms.ValidationError('Image format unknown')
- os.remove(tmp_im_path)
-
- if prev_photo: os.remove(prev_photo.path)
- return uploaded_photo
- else:
- return prev_photo
-
-
-class RegistrationFormCustom(RegistrationFormUniqueEmail):
- """Used instead of RegistrationForm used by default django-registration backend, this adds date of birth and gender to the default django-registration RegistrationForm"""
-
- dob = forms.DateField(help_text = "YYYY-MM-DD", required=True, label=u'date of birth')
- gender = forms.ChoiceField(choices = GENDER_CHOICES, required=True, label=u'gender')
-
- def save(self,profile_callback=None):
- new_user = RegistrationProfile.objects.create_inactive_user(username=self.cleaned_data['username'],password=self.cleaned_data['password1'],email=self.cleaned_data['email'])
-
- new_profile = Profile(user=new_user,dob=self.cleaned_data['dob'],gender=self.cleaned_data['gender'])
- new_profile.save()
-
- create_notification('NU',new_user)
-
- return new_user
-
-def UserChoiceForm(choices, instance=None):
- """ take a list of users and return a choice form.
- """
-
- class myForm(forms.Form):
- user = forms.ChoiceField(choices, required=True)
- return myForm(instance) if instance else myForm()
diff --git a/taskapp/management/__init__.py b/taskapp/management/__init__.py
deleted file mode 100644
index 8b13789..0000000
--- a/taskapp/management/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/taskapp/management/commands/__init__.py b/taskapp/management/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/taskapp/management/commands/seed_db.py b/taskapp/management/commands/seed_db.py
deleted file mode 100644
index 97263d5..0000000
--- a/taskapp/management/commands/seed_db.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import sys
-from datetime import datetime
-from django.core.management.base import NoArgsCommand
-
-from django.contrib.auth.models import User
-
-from pytask.taskapp.events import task as taskEvents
-from pytask.taskapp.events import user as userEvents
-
-from pytask.taskapp.utilities.request import create_request
-from pytask.taskapp.utilities.notification import create_notification
-
-
-def seed_db():
- """ a method to seed the database with random data """
-
- defaultReviewer = userEvents.createSuUser("admin", "admin@example.com", "123456", datetime.now(), "M")
- reviewer_profile = defaultReviewer.get_profile()
- userEvents.updateProfile(reviewer_profile, {'rights':"AD"})
-
- for i in range(1,21):
-
- username = 'user'+str(i)
- email = username+'@example.com'
- password = '123456'
- dob = datetime.now()
- gender = "M"
- user = userEvents.createUser(username,email,password,dob,gender)
- create_notification("NU", user)
-
- if i%4==0:
- create_request(defaultReviewer, "MG", user)
- elif i%3==0:
- create_request(defaultReviewer, "DV", user)
- elif i%2==0:
- create_request(defaultReviewer, "AD", user)
- elif i in [7, 13]:
- user.is_active = False
- user.save()
-
- for i in range(1,21):
-
- title = "Task "+str(i)
- desc = "I am "+title
- created_by = defaultReviewer
- pynts = 20
-
- task = taskEvents.createTask(title,desc,created_by,pynts)
- if task:
- taskEvents.addReviewer(task, defaultReviewer)
- if i%2==0:taskEvents.publishTask(task)
-
-class Command(NoArgsCommand):
-
- def handle_noargs(self, **options):
- """ Just copied the code from seed_db.py """
-
- seed_db()
diff --git a/taskapp/models.py b/taskapp/models.py
deleted file mode 100644
index 7900645..0000000
--- a/taskapp/models.py
+++ /dev/null
@@ -1,183 +0,0 @@
-import os
-
-from django.core.files.storage import FileSystemStorage
-from django.db import models
-from django.contrib.auth.models import User
-
-import tagging
-from tagging.fields import TagField
-
-from pytask.taskapp.utilities.helper import get_key
-
-GENDER_CHOICES = (( 'M', 'Male'), ('F', 'Female'))
-RIGHTS_CHOICES = (
- ("AD", "Admin"),
- ("MG", "Manager"),
- ("DV", "Developer"),
- ("CT", "Contributor"),)
-
-STATUS_CHOICES = (
- ("UP", "Unpublished"),
- ("OP", "Open"),
- ("LO", "Locked"),
- ("WR", "Working"),
- ("CD", "Closed"),
- ("DL", "Deleted"),
- ("CM", "Completed"))
-
-NOTIFY_CHOICES = (
- ("MT", "Add Reviewer"),
- ("DV", "Developer"),
- ("MG", "Manager"),
- ("AD", "Admin"),
- ("PY", "Assign pynts"),
- ("CM", "Task completed"),
- ("CD", "Task closed"),
- ("DL", "Task deleted"),
- ("NU", "New User"),
- ("NT", "New Reviewer"),
- ("ND", "New Developer"),
- ("NG", "New Manager"),
- ("NA", "New Admin"),
- ("AU", "Assign user"), ## i mean assign the task
- ("RU", "Remove user"), ## remove from working users list in task
-)
-
-IMAGES_DIR = "./images"
-UPLOADS_DIR = "./uploads"
-
-class CustomImageStorage(FileSystemStorage):
-
- def path(self, name):
- """ we return images directory path.
- """
-
- return os.path.join(IMAGES_DIR, name)
-
- def get_available_name(self, name):
- """ here we are going with username as the name of image.
- """
-
- root, ext = os.path.splitext(name)
- file_name = get_key() + ext
- while self.exists(file_name):
- file_name = get_key() + ext
- return file_name
-
-class Profile(models.Model):
-
- user = models.ForeignKey(User, unique = True)
- dob = models.DateField(verbose_name = u"Date of Birth", help_text = "YYYY-MM-DD")
- gender = models.CharField(max_length = 1, choices = GENDER_CHOICES)
- rights = models.CharField(max_length = 2, choices = RIGHTS_CHOICES, default = u"CT")
- pynts = models.PositiveSmallIntegerField(default = 0)
-
- aboutme = models.TextField(blank = True)
- foss_comm = TagField(verbose_name="FOSS Communities")
- phonenum = models.CharField(max_length = 15, blank = True, verbose_name = u"Phone Number")
- homepage = models.URLField(blank = True, verbose_name = u"Homepage/Blog")
- street = models.CharField(max_length = 80, blank = True)
- city = models.CharField(max_length = 25, blank = True)
- country = models.CharField(max_length = 25, blank = True)
- nick = models.CharField(max_length = 20, blank = True)
- photo = models.ImageField(storage = CustomImageStorage(),upload_to = IMAGES_DIR, blank = True)
-
- def __unicode__(self):
- return unicode(self.user.username)
-
-class Task(models.Model):
-
- prim_key = models.AutoField(primary_key = True)
- id = models.CharField(max_length = 10, unique = True)
- title = models.CharField(max_length = 100, verbose_name = u"Title", help_text = u"Keep it simple and below 100 chars.")
- desc = models.TextField(verbose_name = u"Description")
- status = models.CharField(max_length = 2, choices = STATUS_CHOICES, default = "UP")
- tags_field = TagField(verbose_name = u"Tags", help_text = u"Give comma seperated tags")
-
- pynts = models.PositiveSmallIntegerField(help_text = u"No.of pynts a user gets on completing the task")
- progress = models.PositiveSmallIntegerField(default = 0)
-
- reviewers = models.ManyToManyField(User, related_name = "%(class)s_reviewers")
- created_by = models.ForeignKey(User, related_name = "%(class)s_created_by")
- claimed_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_claimed_users")
- assigned_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_assigned_users")
-
- creation_datetime = models.DateTimeField()
- published_datetime = models.DateTimeField()
- sub_type = models.CharField(max_length=1, choices = (('D','Dependency'),('S','Subtask')), default = 'D')
-
- def __unicode__(self):
- return unicode(self.title)
-
-class Map(models.Model):
-
- main = models.ForeignKey('Task', related_name = "%(class)s_main")
- subs = models.ManyToManyField('Task', blank = True, null = True, related_name = "%(class)s_subs")
-
-class Comment(models.Model):
-
- task = models.ForeignKey('Task')
- data = models.TextField()
- created_by = models.ForeignKey(User, related_name = "%(class)s_created_by")
- creation_datetime = models.DateTimeField()
- deleted_by = models.ForeignKey(User, null = True, blank = True, related_name = "%(class)s_deleted_by")
- is_deleted = models.BooleanField()
- attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True)
-
- def __unicode__(self):
- return unicode(self.task.title)
-
-class Request(models.Model):
-
- sent_to = models.ManyToManyField(User, related_name = "%(class)s_sent_to", blank = False)
- sent_by = models.ForeignKey(User, related_name = "%(class)s_sent_by", blank = False)
- role = models.CharField(max_length = 2, blank = False)
- reply = models.BooleanField(default = False, blank = False)
- remarks = models.TextField(default = "",blank = True)
-
- is_read = models.BooleanField(default = False, blank = False)
- is_valid = models.BooleanField(default = True, blank = False)
-
- creation_date = models.DateTimeField()
- reply_date = models.DateTimeField()
- is_replied = models.BooleanField(default = False)
- replied_by = models.ForeignKey(User, related_name = "%(class)s_replied_by", blank = True, null = True)
-
- task = models.ForeignKey(Task,related_name = "%(class)s_task", blank = True, null = True)
- receiving_user = models.ForeignKey(User, related_name = "%(class)s_receiving_user", blank = True, null = True)
- pynts = models.PositiveIntegerField(default=0)
-
- def __unicode__(self):
-
- return u"Request %s %s"%(self.sent_by.username, self.role)
-
-class Notification(models.Model):
-
- role = models.CharField(max_length = 2, choices = NOTIFY_CHOICES, blank = False)
- sent_to = models.ForeignKey(User, related_name = "%(class)s_sent_to", blank = False)
- sent_from = models.ForeignKey(User, related_name = "%(class)s_sent_from", null = True, blank = True)
- task = models.ForeignKey(Task, related_name = "%(class)s_task", null = True, blank = True)
-
- sub = models.CharField(max_length = 100)
- message = models.TextField()
- remarks = models.CharField(max_length = 100)
-
- sent_date = models.DateTimeField()
- is_read = models.BooleanField(default = False)
- is_deleted = models.BooleanField(default = False)
-
- def __unicode__(self):
- return u"%s %s %s"%(self.sent_to, self.message, self.sent_date.ctime())
-
-class WorkReport(models.Model):
-
- attachment = models.FileField(upload_to=IMAGES_DIR)
- remarks = models.TextField()
- revision = models.PositiveIntegerField(default=0)
- task = models.ForeignKey(Task, related_name = "%(class)s_report")
- submitted_by = models.ForeignKey(User, related_name = "%(class)s_submitted_by")
-
- created_at = models.DateTimeField()
-
-#tagging.register(Profile)
-#tagging.register(Task)
diff --git a/taskapp/tests.py b/taskapp/tests.py
deleted file mode 100644
index 2247054..0000000
--- a/taskapp/tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-class SimpleTest(TestCase):
- def test_basic_addition(self):
- """
- Tests that 1 + 1 always equals 2.
- """
- self.failUnlessEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-
diff --git a/taskapp/utilities/__init__.py b/taskapp/utilities/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/taskapp/utilities/helper.py b/taskapp/utilities/helper.py
deleted file mode 100644
index ebd7213..0000000
--- a/taskapp/utilities/helper.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import string,random
-
-def get_key():
- """ return a 10 character random key.
- """
-
- return ''.join([ random.choice(string.uppercase+string.digits) for i in range(10)])
-
diff --git a/taskapp/utilities/notification.py b/taskapp/utilities/notification.py
deleted file mode 100644
index 4d67c11..0000000
--- a/taskapp/utilities/notification.py
+++ /dev/null
@@ -1,300 +0,0 @@
-from datetime import datetime
-from django.contrib.auth.models import User
-from pytask.taskapp.models import Notification, RIGHTS_CHOICES
-
-def create_notification(role, sent_to, sent_from=None, reply=None, task=None, remarks=None, requested_by=None, receiving_user=None, pynts=None):
- """
- creates a notification based on the passed arguments.
- role: role of the notification - look at choices in models
- sent_to: a user to which the notification is to be sent
- sent_from : a user from which the message has originated
- A user who approves/rejects in case of request
- A reviewer who closes/complets the task
- reply: A boolean
- task: a task if applicable
- requested_by: a user makes the request
- A reviewer who assigns pynts in case of pynts
- A reviewer who requests to act as a reviewer
- remarks: any remarks for rejecting
- receiving_user: user receiving pynts
- pynts: the obvious
- """
-
- notification = Notification(sent_date = datetime.now())
- notification.role = role
- notification.sent_to = sent_to
- notification.save()
-
- if role == "PY":
-
- notification.sent_from = sent_from
- notification.task = task
- notification.pynts = pynts
-
- task_url= '%s'%(task.id, task.title)
- pynts_url = '%s'%(task.id, "click here")
- reviewer_url = '%s'%(requested_by.id, requested_by.username)
- admin_url = '%s'%(sent_from.id, sent_from.username)
- user_url = '%s'%(receiving_user.id, receiving_user.username)
-
- if reply:
- notification.sub = "Approved request for assign of pynts for %s"%task.title[:20]
- notification.message = """ Request made by %s to assign %s pynts to %s for the task %s has been approved by %s
- %s if you want the view/assign pynts page of the task.
"""%(reviewer_url, pynts, user_url, task_url, admin_url, pynts_url)
-
- else:
- notification.sub = "Rejected request for assign of pynts for %s"%task.title[:20]
- notification.message = """ Request made by %s to assign %s pynts to %s for the task %s has been rejected by %s.
"""%(reviewer_url, pynts, user_url, task_url, admin_url)
- if remarks:
- notification.remarks = remarks
- notification.message += "Reason: %s
"%remarks
- notification.message += "
"
-
- elif role == "MT":
-
- notification.task = task
- notification.sent_from = sent_from
-
- task_url= '%s'%(task.id, task.title)
- requested_reviewer_url = '%s'%(requested_by.id, requested_by.username)
- new_reviewer = sent_from
- new_reviewer_url = '%s'%(new_reviewer.id, new_reviewer.username)
-
- if reply:
- notification.sub = "New reviewer for the task %s"%task.title[:20]
- notification.message = "%s has accepted the request made by %s, asking him act as a reviewer for the task %s
"%(new_reviewer_url, requested_reviewer_url, task_url)
- notification.message += "He can be contacted on %s"%new_reviewer.email
-
- else:
- notification.sub = "%s rejected request to act as a reviewer"%new_reviewer.username
- notification.message = "%s has rejected your request asking him to act as a reviewer for %s.
"%(new_reviewer_url, task_url)
- if remarks:
- notification.remarks = remarks
- notification.message += "Remarks: %s
"%remarks
-
- elif role in ["DV", "MG", "AD"]:
-
- notification.sent_from = sent_from
- accepting_user = sent_from
- user_url = '%s'%(accepting_user.id, accepting_user.username) ## i mean the user who has accepted it
- requested_by_url = '%s'%(requested_by.id, requested_by.username)
- role_rights = dict(RIGHTS_CHOICES)[role]
- role_learn_url = "/about/%s"%role_rights.lower()
- a_or_an = "an" if role_rights == "AD" else "a"
-
- if reply:
- notification.sub = "New %s for the site"%role_rights
- notification.message = "%s has accepted request made by %s asking him to act as %s %s for the website.
"%(user_url, requested_by_url, a_or_an, role_rights)
- else:
- notification.sub = "Rejected your request to act as %s"%role_rights
- notification.message = "%s has rejected your request asking him to act as %s %s.
"%(user_url, a_or_an, role_rights)
- if remarks:
- notification.remarks = remarks
- notification.message += "Remarks: %s
"%remarks
-
- elif role == "NT":
-
- notification.task = task
- new_reviewer = sent_to
- reviewer_learn_url = 'learn more'
- task_url= '%s'%(task.id, task.title)
-
- notification.sub = "You are reviewering the task %s"%task.title[:20]
- notification.message = "You have accepted to act as a reviewer%s for the task %s.
"%(reviewer_learn_url, task_url)
- notification.message += " Here is a list of other reviewers and their email addresses.