usuwanie linkóœ

BeHub/Hub/models.py

@@ -22,6 +22,7 @@ class Category(models.Model):
 
 
 class Beacon(models.Model):
+
     uuid = models.CharField(max_length=300, unique=True)
     name = models.CharField(max_length=300)
     description = models.CharField(max_length=300, null=True)

BeHub/Hub/static/js/beacon.js

@@ -15,7 +15,7 @@ function show_beacons(){
                         '<td>'].join(""));
                             for(var j=0; j<beacon_managers[i].sites.length; j++){
                                 html.push(['<p> <a href="', beacon_managers[i].sites[j].link_url, '">', beacon_managers[i].sites[j].link_url, '</a>',
-                                '</td><td class="col-md-offset-0">','<button onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger" >Usun</button></p>'].join(""))
+                                '<button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Usun</button></p>'].join(""))
                             }
                         html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Dodaj link</button></p>',
                         '</td>',
@@ -47,7 +47,7 @@ function show_beacons_list(){
                         '<td>'].join(""));
                             for(var j=0; j<beacon_managers[i].sites.length; j++){
                                 html.push(['<p> <a href="', beacon_managers[i].sites[j].link_url, '">', beacon_managers[i].sites[j].link_url, '</a>',
-                                 '</td><td class="col-md-offset-0">','<button onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger" >Usun</button></p>'].join(""))
+                                 ,'<button <button style="float: right;" onclick="removeLink(\'', beacon_managers[i].url, '\', \'', beacon_managers[i].sites[j].url,'\')" class="btn btn-danger btn-sm" >Usun</button></p>'].join(""))
                             }
                         html.push(['<p> <button class="btn btn-success" onclick="dodajLink(\'',beacon_managers[i].url, '\')">Dodaj link</button></p>',
                         '</td>',
@@ -99,9 +99,9 @@ function dodajLink(beacon_manager, beacon){
     $.getJSON("/api/category/", function(data){
 
         $("#myModal").modal("show");
-        var html = '<form action="/login/" method="post" class="form-signin">\
-                    <input id="url" type="text" class="form-control" placeholder="Nazwa beacona" required autofocus name="name">\
-                    <input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc">';
+        $("#modal-content").html('<form action="/login/" method="post" class="form-signin">\
+                <p><input id="url" type="text" class="form-control" placeholder="Link url" required autofocus name="name"></p>\
+                <p><input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc"></p>';
 
         html += "<select id=\"kat\" class=\"form-control\">"
         html += "<option value=\"-\">No category</option>";

BeHub/Hub/templates/user_panel/content/beacon_list.html

@@ -48,7 +48,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+        <h4 class="modal-title" id="myModalLabel">Add</h4>
       </div>
       <div class="modal-body" id="modal-content">
 
@@ -66,11 +66,11 @@
 
     $("#myModal").modal("show");
     $("#modal-content").html('<form action="/login/" method="post" class="form-signin">\
-                <input id="name" type="text" class="form-control" placeholder="Nazwa beacona" required autofocus name="name">\
-                <input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc">\
-                <input id="uuid" type="text" class="form-control" placeholder="UUID" required autofocus name="uuid">\
-                <input id="long" type="text" class="form-control" placeholder="Longitude" required autofocus name="long">\
-                <input id="lat" type="text" class="form-control" placeholder="latitude" required autofocus name="lat">\
+                <p><input id="name" type="text" class="form-control" placeholder="Nazwa beacona" required autofocus name="name"></p>\
+                <p><input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc"></p>\
+                <p><input id="uuid" type="text" class="form-control" placeholder="UUID" required autofocus name="uuid"></p>\
+                <p><input id="long" type="text" class="form-control" placeholder="Longitude" required autofocus name="long"></p>\
+                <p><input id="lat" type="text" class="form-control" placeholder="latitude" required autofocus name="lat"></p>\
     </form>');
 
     $("#modal-footer").html('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\

BeHub/Hub/templates/user_panel/content/dashboard.html

@@ -58,8 +58,8 @@
       <div class="modal-body" id="modal-content">
 
           <form action="/login/" method="post" class="form-signin">
-                <input id="name" type="text" class="form-control" placeholder="Nazwa projektu" required autofocus name="name">
-                <textarea id="desc" class="form-control" type="description" id="article_content" name="content" placeholder="Zawartosc" maxlength="140" rows="7"></textarea>
+                <p><input id="name" type="text" class="form-control" placeholder="Nazwa projektu" required autofocus name="name"></p>
+                <p><textarea id="desc" class="form-control" type="description" id="article_content" name="content" placeholder="Zawartosc" maxlength="140" rows="7"></textarea></p>
 
                 </form>
       </div>

BeHub/Hub/templates/user_panel/content/project.html

@@ -10,7 +10,7 @@
 
 
 <div class="row">
-<div class="col-md-10 col-md-offset-1">
+<div class="col-md-10 col-md-offset-1 " >
 
 <ul class="nav nav-tabs nav-justified">
   <li class="active"><a data-toggle="tab" href="#beacons">Twoje beacony</a></li>

BeHub/Hub/templates/user_panel/default/base.html

@@ -29,7 +29,7 @@
         {% block content %}
         {% endblock %}
         </div>
-        {% include 'user_panel/default/footer.html' %}
+
 
     <script src="{% static 'js/map.js' %}"></script>
     <script src="{% static 'js/beacon.js' %}"></script>

BeHub/Hub/views.py

@@ -24,6 +24,32 @@ class BeaconViewSet(viewsets.ModelViewSet):
     queryset = Beacon.objects.all()
     serializer_class = BeaconSerializer
 
+    @detail_route(methods=['post'])
+    def add(self, request, pk=None):
+        print request.data
+        uuid = request.data.get('uuid')
+        longitude = request.data.get('longitude')
+        latitude = request.data.get('latitude')
+        try:
+            beacon = Beacon.objects.get(uuid = uuid)
+        except ObjectDoesNotExist:
+            beacon = Beacon.objects.create(longitude=longitude, latitude=latitude)
+            manager = BeaconManager.objects.create(beacon=beacon)
+            manager.sites = []
+            beacon.uuid = uuid
+            beacon.name = "default Lo:{longitude}, La:{latitude}".format(longitude=longitude, latitude=latitude)
+            beacon.description = "default"
+            beacon.longitude = longitude
+            beacon.latitude = latitude
+            beacon.beacon_manager = manager
+            beacon.save()
+            manager.save()
+            return Response({"success":"True"})
+        return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Somethin wrong my friend"})
+
+
+
+
 
 class UserViewSet(viewsets.ModelViewSet):
     """