- Bei Bereichen ein ModelMultupleChoiceField hinzugefügt, damit nur die Benutzer einem Bereich hinzugefügt werden können, die in der gleichen Agentur sind, wie der angemeldete User. Inkl. SPeichern und Update. TODO Next: Die verfügbaren Choices so umbauen, dass man auch suchen kann.

areas/forms.py

@@ -6,7 +6,6 @@ from dal import autocomplete
 from django.contrib.auth.models import User
 from django import forms
 
-
 class AreaAddAreaForm(forms.ModelForm):
 
 	class Meta:
@@ -14,9 +13,15 @@ class AreaAddAreaForm(forms.ModelForm):
 		labels = {
 			"name" : "Bereichsname",
 			"color" : "Farbe",
-			"desc" : "Kurze Beschreibung"
+			"desc" : "Kurze Beschreibung",
+			"usersfield" : "Zugeteilte Personen"
 		}				
-		fields = ['name', 'color', 'desc']
+		fields = ['name', 'color', 'desc', 'usersfield']
-		
 		
+	def __init__(self, user, *args, **kwargs):		
+		super().__init__(*args, **kwargs)
 
+		users_of_agency = User.objects.filter(profile__agency__pk=user.profile.agency.pk)
+		print(users_of_agency)
+		print(self.fields['usersfield'])
+		self.fields['usersfield'].queryset = users_of_agency 

areas/models.py

@@ -5,7 +5,6 @@ from colorful.fields import RGBColorField
 from django.contrib.auth.models import User
 import datetime
 
-
 '''
 
 Model Areas
@@ -24,9 +23,7 @@ class Areas(models.Model):
 	name = models.CharField(max_length=200, blank=False)
 	color = RGBColorField(colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC', blank=True)
 	desc = models.TextField(max_length=3000, blank=True)
-	#usersfield = MultiSelectField(choices=(()), blank=True)
+	usersfield = models.ManyToManyField(User, blank=True, related_name='users_in_area')
-	#usersfield = forms.ModelMultipleChoiceField(queryset=User.objects.all())
-	#usersfield = forms.ModelChoiceField(queryset=User.objects.filter(profile__pk=1))
 	created_area_by = models.ForeignKey(User, on_delete=models.PROTECT)
 	created_area_date = models.DateField(default=datetime.date.today, blank=True)
 

areas/templates/areas/areas_update.html

@@ -1,4 +1,5 @@
 {% extends "users/base.html" %}
+{% load static %}
 {% load crispy_forms_tags %}
 {% block content %}
 <div class="content-section col-6">

areas/views.py

@@ -61,16 +61,24 @@ class AreaDeleteView(LoginRequiredMixin, DeleteView):
 # Hier andere Nutzer ändern, wenn man Usersmanagement darf!
 class AreaUpdateView(LoginRequiredMixin, UpdateView):
 	model = Areas	
-	form_class= AreaAddAreaForm
 	template_name = 'areas/areas_update.html'
 	success_url = '/areas'
+	form_class = AreaAddAreaForm
 		
-	def get_context_data(self, **kwargs):
+	#def get_context_data(self, **kwargs):
-		context = super(AreaUpdateView, self).get_context_data(**kwargs)					
+	#	context = super(AreaUpdateView, self).get_context_data(**kwargs)	
-		context['active_link'] = 'areasmanagement'
+	#	users_of_agency = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk)
-		return context
+	#	context['possible_users'] = users_of_agency
+	#	context['active_link'] = 'areasmanagement'
+	#	return context
 
 	def form_valid(self, form):	
 		# Send message to the site		
 		messages.success(self.request, f'Bereich aktualisiert!')
 		return super().form_valid(form)
+
+	# Form wird geladen; Checkboxen werden vorbereitet und hier rausgerendert.
+	def get(self,request,*args, **kwargs):
+		# User ist der hier Aufgerufene, bzw. das Profil!
+		loggeduser = self.request.user
+		return render (request, self.template_name, {'form':self.form_class(loggeduser), 'active_link': 'areasmanagement'})

digitaleagentur/settings.py

@@ -32,6 +32,7 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
+    'django_select2',
     'users.apps.UsersConfig',
     'areas.apps.AreasConfig',
     'tasks.apps.TasksConfig',

digitaleagentur/urls.py

@@ -23,6 +23,7 @@ urlpatterns = [
     path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name='users/password_reset_complete.html'), name='password_reset_complete'),
     path('register/', AgencyCreateView.as_view(template_name='users/register.html'), name='register'),
     path('register/done', views.registerdone, name='register-done'),
+    path('select2/', include('django_select2.urls')),
 ]
 if settings.DEBUG:
 	urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

users/static/users/js/demo/chart-area-demo.js

@@ -1,118 +0,0 @@
-// Set new default font family and font color to mimic Bootstrap's default styling
-Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
-Chart.defaults.global.defaultFontColor = '#858796';
-
-function number_format(number, decimals, dec_point, thousands_sep) {
-  // *     example: number_format(1234.56, 2, ',', ' ');
-  // *     return: '1 234,56'
-  number = (number + '').replace(',', '').replace(' ', '');
-  var n = !isFinite(+number) ? 0 : +number,
-    prec = !isFinite(+decimals) ? 0 : Math.abs(decimals),
-    sep = (typeof thousands_sep === 'undefined') ? ',' : thousands_sep,
-    dec = (typeof dec_point === 'undefined') ? '.' : dec_point,
-    s = '',
-    toFixedFix = function(n, prec) {
-      var k = Math.pow(10, prec);
-      return '' + Math.round(n * k) / k;
-    };
-  // Fix for IE parseFloat(0.55).toFixed(0) = 0;
-  s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.');
-  if (s[0].length > 3) {
-    s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep);
-  }
-  if ((s[1] || '').length < prec) {
-    s[1] = s[1] || '';
-    s[1] += new Array(prec - s[1].length + 1).join('0');
-  }
-  return s.join(dec);
-}
-
-// Area Chart Example
-var ctx = document.getElementById("myAreaChart");
-var myLineChart = new Chart(ctx, {
-  type: 'line',
-  data: {
-    labels: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-    datasets: [{
-      label: "Earnings",
-      lineTension: 0.3,
-      backgroundColor: "rgba(78, 115, 223, 0.05)",
-      borderColor: "rgba(78, 115, 223, 1)",
-      pointRadius: 3,
-      pointBackgroundColor: "rgba(78, 115, 223, 1)",
-      pointBorderColor: "rgba(78, 115, 223, 1)",
-      pointHoverRadius: 3,
-      pointHoverBackgroundColor: "rgba(78, 115, 223, 1)",
-      pointHoverBorderColor: "rgba(78, 115, 223, 1)",
-      pointHitRadius: 10,
-      pointBorderWidth: 2,
-      data: [0, 10000, 5000, 15000, 10000, 20000, 15000, 25000, 20000, 30000, 25000, 40000],
-    }],
-  },
-  options: {
-    maintainAspectRatio: false,
-    layout: {
-      padding: {
-        left: 10,
-        right: 25,
-        top: 25,
-        bottom: 0
-      }
-    },
-    scales: {
-      xAxes: [{
-        time: {
-          unit: 'date'
-        },
-        gridLines: {
-          display: false,
-          drawBorder: false
-        },
-        ticks: {
-          maxTicksLimit: 7
-        }
-      }],
-      yAxes: [{
-        ticks: {
-          maxTicksLimit: 5,
-          padding: 10,
-          // Include a dollar sign in the ticks
-          callback: function(value, index, values) {
-            return '$' + number_format(value);
-          }
-        },
-        gridLines: {
-          color: "rgb(234, 236, 244)",
-          zeroLineColor: "rgb(234, 236, 244)",
-          drawBorder: false,
-          borderDash: [2],
-          zeroLineBorderDash: [2]
-        }
-      }],
-    },
-    legend: {
-      display: false
-    },
-    tooltips: {
-      backgroundColor: "rgb(255,255,255)",
-      bodyFontColor: "#858796",
-      titleMarginBottom: 10,
-      titleFontColor: '#6e707e',
-      titleFontSize: 14,
-      borderColor: '#dddfeb',
-      borderWidth: 1,
-      xPadding: 15,
-      yPadding: 15,
-      displayColors: false,
-      intersect: false,
-      mode: 'index',
-      caretPadding: 10,
-      callbacks: {
-        label: function(tooltipItem, chart) {
-          var datasetLabel = chart.datasets[tooltipItem.datasetIndex].label || '';
-          return datasetLabel + ': $' + number_format(tooltipItem.yLabel);
-        }
-      }
-    }
-  }
-});

users/static/users/js/demo/chart-bar-demo.js

@@ -1,111 +0,0 @@
-// Set new default font family and font color to mimic Bootstrap's default styling
-Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
-Chart.defaults.global.defaultFontColor = '#858796';
-
-function number_format(number, decimals, dec_point, thousands_sep) {
-  // *     example: number_format(1234.56, 2, ',', ' ');
-  // *     return: '1 234,56'
-  number = (number + '').replace(',', '').replace(' ', '');
-  var n = !isFinite(+number) ? 0 : +number,
-    prec = !isFinite(+decimals) ? 0 : Math.abs(decimals),
-    sep = (typeof thousands_sep === 'undefined') ? ',' : thousands_sep,
-    dec = (typeof dec_point === 'undefined') ? '.' : dec_point,
-    s = '',
-    toFixedFix = function(n, prec) {
-      var k = Math.pow(10, prec);
-      return '' + Math.round(n * k) / k;
-    };
-  // Fix for IE parseFloat(0.55).toFixed(0) = 0;
-  s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.');
-  if (s[0].length > 3) {
-    s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep);
-  }
-  if ((s[1] || '').length < prec) {
-    s[1] = s[1] || '';
-    s[1] += new Array(prec - s[1].length + 1).join('0');
-  }
-  return s.join(dec);
-}
-
-// Bar Chart Example
-var ctx = document.getElementById("myBarChart");
-var myBarChart = new Chart(ctx, {
-  type: 'bar',
-  data: {
-    labels: ["January", "February", "March", "April", "May", "June"],
-    datasets: [{
-      label: "Revenue",
-      backgroundColor: "#4e73df",
-      hoverBackgroundColor: "#2e59d9",
-      borderColor: "#4e73df",
-      data: [4215, 5312, 6251, 7841, 9821, 14984],
-    }],
-  },
-  options: {
-    maintainAspectRatio: false,
-    layout: {
-      padding: {
-        left: 10,
-        right: 25,
-        top: 25,
-        bottom: 0
-      }
-    },
-    scales: {
-      xAxes: [{
-        time: {
-          unit: 'month'
-        },
-        gridLines: {
-          display: false,
-          drawBorder: false
-        },
-        ticks: {
-          maxTicksLimit: 6
-        },
-        maxBarThickness: 25,
-      }],
-      yAxes: [{
-        ticks: {
-          min: 0,
-          max: 15000,
-          maxTicksLimit: 5,
-          padding: 10,
-          // Include a dollar sign in the ticks
-          callback: function(value, index, values) {
-            return '$' + number_format(value);
-          }
-        },
-        gridLines: {
-          color: "rgb(234, 236, 244)",
-          zeroLineColor: "rgb(234, 236, 244)",
-          drawBorder: false,
-          borderDash: [2],
-          zeroLineBorderDash: [2]
-        }
-      }],
-    },
-    legend: {
-      display: false
-    },
-    tooltips: {
-      titleMarginBottom: 10,
-      titleFontColor: '#6e707e',
-      titleFontSize: 14,
-      backgroundColor: "rgb(255,255,255)",
-      bodyFontColor: "#858796",
-      borderColor: '#dddfeb',
-      borderWidth: 1,
-      xPadding: 15,
-      yPadding: 15,
-      displayColors: false,
-      caretPadding: 10,
-      callbacks: {
-        label: function(tooltipItem, chart) {
-          var datasetLabel = chart.datasets[tooltipItem.datasetIndex].label || '';
-          return datasetLabel + ': $' + number_format(tooltipItem.yLabel);
-        }
-      }
-    },
-  }
-});

users/static/users/js/demo/chart-pie-demo.js

@@ -1,35 +0,0 @@
-// Set new default font family and font color to mimic Bootstrap's default styling
-Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
-Chart.defaults.global.defaultFontColor = '#858796';
-
-// Pie Chart Example
-var ctx = document.getElementById("myPieChart");
-var myPieChart = new Chart(ctx, {
-  type: 'doughnut',
-  data: {
-    labels: ["Direct", "Referral", "Social"],
-    datasets: [{
-      data: [55, 30, 15],
-      backgroundColor: ['#4e73df', '#1cc88a', '#36b9cc'],
-      hoverBackgroundColor: ['#2e59d9', '#17a673', '#2c9faf'],
-      hoverBorderColor: "rgba(234, 236, 244, 1)",
-    }],
-  },
-  options: {
-    maintainAspectRatio: false,
-    tooltips: {
-      backgroundColor: "rgb(255,255,255)",
-      bodyFontColor: "#858796",
-      borderColor: '#dddfeb',
-      borderWidth: 1,
-      xPadding: 15,
-      yPadding: 15,
-      displayColors: false,
-      caretPadding: 10,
-    },
-    legend: {
-      display: false
-    },
-    cutoutPercentage: 80,
-  },
-});

users/static/users/js/demo/datatables-demo.js

@@ -1,4 +0,0 @@
-// Call the dataTables jQuery plugin
-$(document).ready(function() {
-  $('#dataTable').DataTable();
-});

users/templates/users/base.html

@@ -14,9 +14,10 @@
   
   <link rel="canonical" href="https://www.digitale-agentur.com">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-
+  <script src="{%static 'users/js/bootstrap-multiselect.js' %}"></script>
 
   <link href="{%static 'users/vendor/fontawesome-free/css/all.min.css' %}" rel="stylesheet" type="text/css">
+  <link href="{%static 'users/css/bootstrap-multiselect.css' %}" rel="stylesheet" type="text/css">
   
   <link href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
 
@@ -249,10 +250,8 @@
     <i class="fas fa-angle-up"></i>
   </a>
 
-  
-
   <!-- Bootstrap core JavaScript-->
-  <script src="{%static 'users/vendor/jquery/jquery.min.js' %}"></script>
+  <!--<script src="{%static 'users/vendor/jquery/jquery.min.js' %}"></script>-->
   <script src="{%static 'users/vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
 
   <!-- Core plugin JavaScript-->
@@ -261,6 +260,8 @@
   <!-- Custom scripts for all pages-->
   <script src="{%static 'users/js/sb-admin-2.min.js' %}"></script>
 
+  
+
   <!-- Page level plugins -->
   <!--<script src="vendor/chart.js/Chart.min.js"></script>-->