# HG changeset patch
# User nishanth
# Date 1267571738 -19800
# Node ID c083ebb6f8d72226006d34984b555300bc81fc09
# Parent f65e62255e47147ab2484277b14f30f03774584e
finished the phase-2 successfully. added all the learnmore templates. hav to look for bugs if any.
diff -r f65e62255e47 -r c083ebb6f8d7 taskapp/utilities/notification.py
--- a/taskapp/utilities/notification.py Wed Mar 03 04:08:15 2010 +0530
+++ b/taskapp/utilities/notification.py Wed Mar 03 04:45:38 2010 +0530
@@ -96,7 +96,7 @@
notification.task = task
new_mentor = sent_to
- mentor_learn_url = 'learn more'
+ mentor_learn_url = 'learn more'
task_url= '%s'%(task.id, task.title)
notification.sub = "You are mentoring the task %s"%task.title[:20]
diff -r f65e62255e47 -r c083ebb6f8d7 taskapp/views/user.py
--- a/taskapp/views/user.py Wed Mar 03 04:08:15 2010 +0530
+++ b/taskapp/views/user.py Wed Mar 03 04:45:38 2010 +0530
@@ -22,10 +22,11 @@
"starthere": "about/starthere.html",
"task": "about/task.html",
"tasklife": "about/tasklife.html",
- "developer": "about/developer.html",
- ## "manager":
- ## "admin":
- ## "request": - also contains about automatic rejection of requests
+ "developer": "about/developer.html",
+ "notification": "about/notification.html",
+ "request": "about/request.html",
+ "manager": "about/manager.html",
+ "admin": "about/admin.html",
}
def show_msg(user, message, redirect_url=None, url_desc=None):
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/admin.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/about/admin.html Wed Mar 03 04:45:38 2010 +0530
@@ -0,0 +1,8 @@
+{% extends 'base.html' %}
+{% block title %}
+ PyTasks - About - Admin
+{% endblock %}
+{% block content %}
+ Admin is the user who has to approve assign of credits to any user for his/her work on the task.
+ An Admin also has the right to request normal users to become admins or managers or developers.
+{% endblock %}
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/developer.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/about/developer.html Wed Mar 03 04:45:38 2010 +0530
@@ -0,0 +1,8 @@
+{% extends 'base.html' %}
+{% block title %}
+ PyTasks - About - Developer
+{% endblock %}
+{% block content %}
+ A Developer has the right to post a task. The link is available on your homepage.
+ click here to know the complete life cycle of a task.
+{% endblock %}
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/manager.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/about/manager.html Wed Mar 03 04:45:38 2010 +0530
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block title %}
+ PyTasks - About - Manager
+{% endblock %}
+{% block content %}
+ A Manager has the right to request normal users to become managers or developers.
+{% endblock %}
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/notification.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/about/notification.html Wed Mar 03 04:45:38 2010 +0530
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block title %}
+ PyTasks - About - Notification
+{% endblock %}
+{% block content %}
+ Notification is a message generated by the system to inform you about any events.
+{% endblock %}
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/request.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/about/request.html Wed Mar 03 04:45:38 2010 +0530
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% block title %}
+ PyTasks - About - Request
+{% endblock %}
+{% block content %}
+ Request is a request made by a user, requesting you to become someone else. It can also be request of assigning pynts to a user
+ for a task ( goes to all the admins only ).
+ You can accept or reject a request. You can also provide optional remarks when rejecting. When you respond to a request, it is
+ automatically removed from your requests and you will be redirected to browse requests page.
+ Redundant requests are automatically removed.
+ The following can be redundant requests.
+
+ - You are requested to act as a mentor and the task is published or deleted or closed or completed
+ - There are requests for assigning pynts to a user for a task and the task is closed or completed
+ - There are requests for assigning pynts to a user and the user is removed from the working users of the task
+
+ These redundant requests when removed, a notification is sent to the requested user.
+
+ - You accept a request to act as mentor for a task and there are similar requests
+ - You accept a request to act as an admin and there are similar or less privileged requests ("Manager", "Developer")
+ - You accept a request to act as a manager and there are similar or less privileged requests ("Developer")
+ - You accept a request to act as a developer and there are similar requests
+
+
+{% endblock %}
diff -r f65e62255e47 -r c083ebb6f8d7 templates/about/tasklife.html
--- a/templates/about/tasklife.html Wed Mar 03 04:08:15 2010 +0530
+++ b/templates/about/tasklife.html Wed Mar 03 04:45:38 2010 +0530
@@ -27,6 +27,8 @@
request for assign of credits to the task implies that someone has worked on the task and hence dependencies cannot be
added after that.
+ The users can be selected to work or removed from working users at any point in time. If a user is removed, he can claim again
+ to request to continue working on the task. If a user is removed, all the pending requests for assigning pynts to user will be made invalid.
After a considerable amount of work has been done and all the users and mentors have been assigned pynts properly, any mentor in the
task can mark the task as complete. The link is available on assign pynts page just in case
the mentor wants to assign more pynts before marking the task as complete.