[chronojump-server] Implementant AddModifyDelete Task
- From: Max Ros i Morejon <maxros src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Implementant AddModifyDelete Task
- Date: Sun, 25 Nov 2018 14:34:18 +0000 (UTC)
commit 4c7b6dfc28b7e6c594d509203c280566fa14298f
Author: Max Ros i Morejon <mros33 gmail com>
Date: Sun Nov 25 12:30:02 2018 +0100
Implementant AddModifyDelete Task
.../chronojump_networks/tasks/api/views.py | 4 +++-
.../organizations/groups/group_players_list.html | 26 +++++++++++++++++++---
chronojumpserver/api.py | 2 ++
3 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/tasks/api/views.py
b/chronojumpserver-django/chronojump_networks/tasks/api/views.py
index 894ed52..ce980d0 100644
--- a/chronojumpserver-django/chronojump_networks/tasks/api/views.py
+++ b/chronojumpserver-django/chronojump_networks/tasks/api/views.py
@@ -17,6 +17,7 @@ class ListCreateAPIView(ListCreateAPIView):
return Task.objects.all()
def create(self, request, *args, **kwargs):
+ print("crea task")
data = dict(request.data)
# TODO: Sure there is a better way to do this
o = Task.objects.create(
@@ -40,13 +41,14 @@ class ListCreateAPIView(ListCreateAPIView):
return Response(s.data)
class TaskRetrieveUpdateDestroyAPIView(RetrieveUpdateDestroyAPIView):
-
permission_classes = (IsAuthenticated, )
serializer_class = TaskSerializer
lookup_field = 'taskId'
+ print("RetrieveUpdateDestroyAPIView function")
def retrieve(self, request, *args, **kwars):
#print(self.kwargs['task_id'])
+ print("arriba a aqui")
o = get_object_or_404(Task, id=self.kwargs['taskId'])
s = TaskSerializer(o)
return Response(s.data)
diff --git
a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
index 687f272..569af0a 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
@@ -16,7 +16,7 @@
<div class="page-header row">
<div class="col-sm-9">
- <!--<img src="/media/{{ user.organization.image }}" class="img-fluid float-left" width="48px"
height="48px" style="margin-top:12px;margin-right:10px;"/>-->
+ <img src="/media/{{ user.organization.image }}" class="img-fluid float-left" width="48px" height="48px"
style="margin-top:12px;margin-right:10px;"/>
<h1 class="display-4">{{group.name}} <small class="text-muted" style="font-size:32px">{% trans 'Players
and tasks' %}</small></h1>
</div>
<div class="col-sm-3">
@@ -306,8 +306,27 @@
row.child( format(row.data()) ).show();
tr.addClass('shown');
}
+
+ //WATCH OUT, CODI MAX
+
+ $('.task-modify-link').on('click', function() {
+ console.log("Clicant modificar botó");
+ $('#taskModalForm').modal('show');
+ });
+
+ $('.task-duplicate-link').on('click', function() {
+ console.log("Clicant duplicar botó");
+ });
+
+ $('.task-delete-link').on('click', function() {
+ console.log("Clicant esborrar botó");
+ });
+
+ //FI CODI MAX
+
} );
-
+
+
function enablePlayersTableFunctionality() {
// Enanble checkboxes
$('.removePlayerBtn').removeClass('disabled').addClass('disabled');
@@ -533,8 +552,8 @@
});
}
-
$('#btnAddModifyTask').on('click', function(e) {
+ console.log("botó addmodifytask 0");
e.preventDefault();
var task = serializeTask();
putTask(task);
@@ -594,6 +613,7 @@
function putTask(task) {
/* TODO: Add validation */
+ console.log("botó addmodifytask 1");
$.ajax({
'url': "{% url 'api_tasks:tasks' %}",
'method': 'POST',
diff --git a/chronojumpserver/api.py b/chronojumpserver/api.py
index 6b54b37..afe85c2 100755
--- a/chronojumpserver/api.py
+++ b/chronojumpserver/api.py
@@ -156,6 +156,7 @@ def register_rfid():
@app.route('/api/v1/tasks', methods=['PUT', 'DELETE'])
def add_modify_delete_task():
"""Add/Modify or delete a task."""
+ console.log("Provant add modify delete 0");
if request.method == 'PUT':
personId = request.form['playerId']
stationId = request.form['stationId']
@@ -209,6 +210,7 @@ def add_modify_delete_task():
db_session.commit()
elif request.method == "DELETE":
"""Delete the task."""
+ console.log("Provant delete 1");
taskId = request.form.get('taskId', None)
t = Task.query.filter(Task.id == taskId).first()
db_session.delete(t)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]