From 1bb85363b851cefda4a9a7b1c0288e8c80ed6dc7 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 5 Jan 2020 15:16:38 +0100
Subject: [PATCH] =?UTF-8?q?0.7.3=20colorpicker=20f=C3=BCr=20allegit=20push?=
 =?UTF-8?q?!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 areas/__pycache__/views.cpython-38.pyc      | Bin 4913 -> 4930 bytes
 areas/templates/areas/areas_add.html        |  31 ++++++++++++-
 areas/templates/areas/areas_management.html |   8 +---
 areas/templates/areas/areas_update.html     |  47 ++++++++++++++++++--
 areas/views.py                              |   1 +
 tasks/templates/tasks/tasks_update.html     |  10 ++++-
 6 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc
index f12ca16682ae30d7b8182a440bee0b04e383acc3..fc512e95a0856ebe840053696c720528538c44d6 100644
GIT binary patch
delta 475
zcmYMwze~eF6bJCU^oKDvX&Mk)ZM7=ac5qPWqLbK)v}zSwv7riqL|ZMXoRu!!y6GTz
zI0;h0T}n4M-JM*d|AM&r2l!qP%<##(_r7-*(o4K0l#-&z0zMz#p`+)Xl9uB$xM~Vr
zXbY#J1&<;KO-~y-fNyU{==!)JPmlRo0Ap;Cm_P=;b5?Vj{8~;9`*AIZDoFho`3fRA
z%FGe-M3M+2WqufV0<|wH_W*hRpvL^`G~3{>>a@N`WsxW$DKFdQKdL=ipw0*pAy$Y@
z?gXQ${|#Hz94DegjF=>*h;7~vF2#1S9E`LY?5yUTTwd6W?b9$z<hZCU!2wTe38?al
zmIj;OYBzcJ?j1}R0mp8c%r+a$vY9b-TyxBN!*airEmJ_kz~8X6lUXfhGpvmLl*|me
zp}^~*xp;-jAho^jKXi|EcUflBWESs*60tj+U+9PcGN_<|1UgnSNFuB9pU@{9^LIV$
Pw=sc@FMZ83D=qv2<56dd

delta 505
zcmYL_PcH*O7{+(Dt+KlPw`tO9>tE8c2L}=d90YBoN;POu37ObYOKp?4+cc4igPV)P
zIB}`eUBovKH(x+{aQ7V?%)24x@XI^T^Sm?f%xn5Nt(H_(k;Lj0UHk24by~>{h@CC9
zNlQAB4e}rp$#z{yZFh@2kWERK3+ItV2FyG>9;T;ugI3MD$-o}bJ>V0qFo}o@@H=JP
z>lTG1`(NIbYZA+$l|qam#t~709d7v^iTa|c_k^tQCx3D#i{7$8S2;4FZXa0mjCK2}
z^skgnLwCUj#x@aK0=gTD+!J7t0xJE87-9~Q=a+$m{@<{QB0d%ph$LbVF@#v-Z-J>~
zQIy^OW(`hFtJ0`5fD)P+M2>60DYDIprt#gNMk@R)I86-R3Et$L``1OP?6X*t0;4rB
z7?iz7rbVkY!<iOlG0-alzh<eJS=h>EU`Ob>0=sxifnS7DsXZ(MD7&4nb&hqq3~Ez2
lM0?(uq#N>+TmBV_i+McZ55o9oIND=ipu)eyORmx0i666GcYy!^

diff --git a/areas/templates/areas/areas_add.html b/areas/templates/areas/areas_add.html
index a3c2375..8402eb9 100644
--- a/areas/templates/areas/areas_add.html
+++ b/areas/templates/areas/areas_add.html
@@ -6,11 +6,38 @@
   <hr>  
   <form method="POST">
 	  	{% csrf_token %}
-	  	{{ form|crispy }}		
+	  	{{ form|crispy }}	
+	  	<div class="form-group mb-2 mb-3">		    
+	    <span>Farbe</span><input type="color" id="color-picker" name="areacolor " />
+	  </div>  	
 	  	<p>Nachdem Erstellen eines Bereichs können Mitarbeiter zugewiesen werden.</p>
 	  <hr>	  	
 	  	<button type="submit" class="btn btn-success"  href="{% url 'areas-addarea' %} ">Bereich anlegen</button>&nbsp;
 	  	<a class="btn" href="{% url 'areas-management' %} ">Abbrechen</a>
   </form>
 </div>
-{% endblock content %}
\ No newline at end of file
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css"/> <!-- 'classic' theme -->
+
+<script src="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.es5.min.js"></script>
+<script type="text/javascript">
+
+$(document).ready(function(){
+	$("#div_id_color").hide();
+})
+
+const pickr1 = new Pickr({
+  el: '#color-picker',
+  default: "#000000",  
+  components: {
+    preview: false,
+    hue: true
+  }
+});
+
+pickr1.on('changestop', function(){
+	var col = pickr1.getColor().toHEXA().toString();
+	pickr1.setColor(col);
+	$("#id_color").val(col);
+});
+</script>
+{% endblock content %}
diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html
index c82ec16..b187327 100644
--- a/areas/templates/areas/areas_management.html
+++ b/areas/templates/areas/areas_management.html
@@ -63,15 +63,11 @@ $(document).ready(function(){
     $("#tableresults tr").filter(function() {
       $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
     });
-
-    
-
-
   });
-
-
 });
 
+
+
 /*
   Update the sort-list by drag'n'drop
 */
diff --git a/areas/templates/areas/areas_update.html b/areas/templates/areas/areas_update.html
index 28e20f9..2922aeb 100644
--- a/areas/templates/areas/areas_update.html
+++ b/areas/templates/areas/areas_update.html
@@ -7,15 +7,18 @@
   <hr>  
   <form method="POST">
 	  	{% csrf_token %}	  	
-	  	{{ form|crispy }}	  			  		  
+	  	{{ form|crispy }}	
+	   <div class="form-group mb-2 mb-3">		    
+	    <span>Farbe</span><input type="color" id="color-picker" name="areacolor " />
+	  </div>  			  		  
 	  <h6>Mitarbeiter hinzufügen</h6>
 	  <div class="input-group mb-3">
-		  <input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkValue()" onchange="javascript:checkValue()">
+		  <input class="form-control" list="usersfree" name="searchusers" id="searchusers" type="text" onkeyup="javascript:checkValue()" onchange="javascript:checkValue()" >
 		  <div class="input-group-append">
 		  	<button type="button" id="addusertoareabtn" onclick="javascript:addUserToArea()" class="btn btn-success" disabled>Mitarbeiter hinzufügen</button>
 		  	<button type="button" onclick="javascript:clearSearchfield()" class="btn btn-secondary" ><i class="fas fa-times"></i></button>
 		  </div>
-			  <datalist id="usersfree" >
+			  <datalist id="usersfree">
 			  	{% for us in possible_users %}
 			    	<option id="{{us.pk}}" value="{{us.first_name}} {{us.last_name}}"></option>			    
 			    {% endfor %}
@@ -41,7 +44,44 @@
   	<a class="btn" href="{% url 'areas-management' %} ">Abbrechen</a>
   </form>
 </div>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css"/> <!-- 'classic' theme -->
+
+<script src="https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.es5.min.js"></script>
 <script type="text/javascript">
+
+$(document).ready(function(){
+	$("#div_id_color").hide();
+})
+
+const pickr1 = new Pickr({
+  el: '#color-picker',
+  default: "{{object.color}}",  
+  components: {
+    preview: false,
+    hue: true
+  }
+});
+
+
+pickr1.on('changestop', function(){
+	var col = pickr1.getColor().toHEXA().toString();
+	pickr1.setColor(col);
+	$("#id_color").val(col);
+});
+
+var ua = window.navigator.userAgent;
+var isIE = /MSIE|Trident/.test(ua);
+if ( isIE ) {
+  //IE specific code goes here
+  	setInterval(function()
+	{
+	    checkValue();
+	},250);
+}
+
+
+
+
 	var tempid = null;
 	var tempcounter = 0;
 	function addUserToArea(){
@@ -118,7 +158,6 @@
 	//Check for valid input on inputfield
 	function checkValue(){			
 		var g = $('#searchusers').val();
-		console.log(g);
     	var id = $('#usersfree').find('option[value="' + g + '"]').attr('id');
     	if(id != undefined && id.length > 0){    		
     		tempid = id;
diff --git a/areas/views.py b/areas/views.py
index 96880b1..03dfc5a 100644
--- a/areas/views.py
+++ b/areas/views.py
@@ -75,6 +75,7 @@ class AreaUpdateView(LoginRequiredMixin, UpdateView):
 	def form_valid(self, form):	
 		# Send message to the site		
 		messages.success(self.request, f'Bereich aktualisiert!')
+		print(form)
 		return super().form_valid(form)
 
 	# Form wird geladen; Checkboxen werden vorbereitet und hier rausgerendert.
diff --git a/tasks/templates/tasks/tasks_update.html b/tasks/templates/tasks/tasks_update.html
index 6482e8a..849dadd 100644
--- a/tasks/templates/tasks/tasks_update.html
+++ b/tasks/templates/tasks/tasks_update.html
@@ -43,7 +43,15 @@
 </div>
 <script type="text/javascript">
 
-
+var ua = window.navigator.userAgent;
+var isIE = /MSIE|Trident/.test(ua);
+if ( isIE ) {
+  //IE specific code goes here
+  	setInterval(function()
+	{
+	    checkSearchUser();
+	},250);
+}
 
 	var tempid = null;
 	var tempcounter = 0;