Zwischensicherung 0.8.2 Newsreiter für ausstehende hinzugefügt

digitaleagentur/settings.py

@@ -168,6 +168,7 @@ MEDIA_URL = '/media/'
 GRAPPELLI_CLEAN_INPUT_TYPES = False
 
 # EMAILs
+'''
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.strato.de'
 EMAIL_PORT = 587
@@ -175,7 +176,16 @@ EMAIL_USE_TLS = True
 EMAIL_HOST_USER = "support@digitale-agentur.com"
 EMAIL_HOST_PASSWORD = "aPx9m3!7x3m@8o!t"
 DEFAULT_FROM_EMAIL = "support@digitale-agentur.com"
+'''
 
+# EMAILs DEV DATA
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'gymhum.de'
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True
+EMAIL_HOST_USER = "holger.trampe"
+EMAIL_HOST_PASSWORD = "Motte2016_!"
+DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de"
 
 
 # FOR DATEPICKER

news/templates/news/news_management.html

@@ -16,6 +16,9 @@
       <li class="nav-item">
           <a class="nav-link" id="act" data-toggle="tab" href="#t_act" role="tab" aria-controls="news" aria-selected="false">Aktuelle</a>
       </li>      
+      <li class="nav-item">
+          <a class="nav-link" id="coming" data-toggle="tab" href="#t_coming" role="tab" aria-controls="coming" aria-selected="false">Ausstehende</a>
+      </li> 
       <li class="nav-item">
           <a class="nav-link" id="archiv" data-toggle="tab" href="#t_archiv" role="tab" aria-controls="archiv" aria-selected="false">Archiv</a>
       </li>       
@@ -69,7 +72,60 @@
               </table>
             </div>
           </div>
-       </div>  
+       </div>
+
+
+      <div class="tab-pane fade" id="t_coming" role="tabpanel" aria-labelledby="coming">
+            <h5 class="mt-3"><a href="" style="color: #000000;">Ausstehende News</a></h5>
+            <hr>
+            <div class="row">                    
+                <div class="table-responsive">
+                <table class="table table-hover">
+                      <thead>
+                      <tr>
+                        <th scope="col">Titel</th>
+                        <th scope="col">Erstellt von</th>
+                        <th scope="col">Erstellt am</th>
+                        <th scope="col">Sichtbar von/bis</th>                                 
+                        <th scope="col">&nbsp;</th>
+                      </tr>
+                    </thead>
+                    <tbody id="tableresults_arch">
+                     {% for news_single in news_coming %}         
+                      <tr>
+                          <td><a href="{% url 'news-single' news_single.pk %}">{{news_single.name }}</a></td>
+                          <td>{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}</td>
+                          <td>{{ news_single.created_date }}</td>               
+                          <td>{{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}</td>
+                           <td>
+                            {% if news_single.created_by == request.user or perms.users.news_management %}
+                              <div class="dropdown no-arrow">
+                                <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                  <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
+                                </a>
+                                <div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
+                                  <a class="dropdown-item" href="{% url 'news-update' news_single.pk %}" class="btn">Bearbeiten</a>
+                                  <div class="dropdown-divider"></div>       
+                                  <a class="dropdown-item text-danger" href="{% url 'news-delete' news_single.pk %}">Löschen</a>
+                                </div>
+                              </div>
+                            {% endif %}
+                            </div>
+                          </td>  
+                      </tr>
+                    {% endfor %} 
+                    </tbody> 
+                  </table>
+                </div>
+              </div>
+       </div>            
+
+
+
+
+
+
+
        <div class="tab-pane fade" id="t_archiv" role="tabpanel" aria-labelledby="act">
             <h5 class="mt-3"><a href="" style="color: #000000;">Archivierte News</a></h5>
             <hr>

news/views.py

@@ -20,8 +20,11 @@ class NewsManagement(LoginRequiredMixin, ListView):
 		filterdate = timezone.now()		
 		news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date')
 		news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date')
+
+		news_coming = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__gt=filterdate).order_by('-created_date')
+
 		context = super().get_context_data(**kwargs)
-		context.update({'active_link' : 'dashboard', 'news' : news, 'news_arch' : news_arch})
+		context.update({'active_link' : 'dashboard', 'news' : news, 'news_arch' : news_arch, 'news_coming' : news_coming})
 		return context
 '''
 class NewsAddNews(LoginRequiredMixin, CreateView):