Remove battery field from maintenance record form
This commit is contained in:
@@ -26,20 +26,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-6">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="{{ form.battery.id_for_label }}" class="form-label font-weight-semibold">
|
|
||||||
{{ form.battery.label }}
|
|
||||||
</label>
|
|
||||||
{{ form.battery }}
|
|
||||||
{% if form.battery.errors %}
|
|
||||||
{% for error in form.battery.errors %}
|
|
||||||
<div class="invalid-feedback d-block">{{ error }}</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="{{ form.supplier.id_for_label }}" class="form-label font-weight-semibold">
|
<label for="{{ form.supplier.id_for_label }}" class="form-label font-weight-semibold">
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import logging
|
||||||
from django.shortcuts import render, redirect
|
from django.shortcuts import render, redirect
|
||||||
from django.views.generic import ListView, CreateView, UpdateView, DeleteView
|
from django.views.generic import ListView, CreateView, UpdateView, DeleteView
|
||||||
from django.urls import reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
@@ -5,6 +6,8 @@ from django.contrib import messages
|
|||||||
from .models import UPSHost, Battery, Contact, Supplier, MaintenanceRecord
|
from .models import UPSHost, Battery, Contact, Supplier, MaintenanceRecord
|
||||||
from .forms import BatteryFormSet, UPSHostForm
|
from .forms import BatteryFormSet, UPSHostForm
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class DashboardView(ListView):
|
class DashboardView(ListView):
|
||||||
template_name = 'ups_manager/index.html'
|
template_name = 'ups_manager/index.html'
|
||||||
@@ -118,6 +121,10 @@ class UPSHostUpdateView(UpdateView):
|
|||||||
return context
|
return context
|
||||||
|
|
||||||
def form_valid(self, form):
|
def form_valid(self, form):
|
||||||
|
logger.info(f"POST data: {self.request.POST}")
|
||||||
|
logger.info(f"Form data: {form.cleaned_data}")
|
||||||
|
logger.info(f"last_maintenance_date value: {form.cleaned_data.get('last_maintenance_date')}")
|
||||||
|
|
||||||
self.object = form.save()
|
self.object = form.save()
|
||||||
|
|
||||||
if self.request.POST:
|
if self.request.POST:
|
||||||
@@ -128,6 +135,10 @@ class UPSHostUpdateView(UpdateView):
|
|||||||
messages.success(self.request, 'UPS主机和电池信息已更新')
|
messages.success(self.request, 'UPS主机和电池信息已更新')
|
||||||
return redirect(self.success_url)
|
return redirect(self.success_url)
|
||||||
|
|
||||||
|
def form_invalid(self, form):
|
||||||
|
logger.error(f"Form errors: {form.errors}")
|
||||||
|
return super().form_invalid(form)
|
||||||
|
|
||||||
|
|
||||||
class UPSHostDeleteView(DeleteView):
|
class UPSHostDeleteView(DeleteView):
|
||||||
model = UPSHost
|
model = UPSHost
|
||||||
@@ -277,14 +288,14 @@ class MaintenanceListView(ListView):
|
|||||||
class MaintenanceCreateView(CreateView):
|
class MaintenanceCreateView(CreateView):
|
||||||
model = MaintenanceRecord
|
model = MaintenanceRecord
|
||||||
template_name = 'ups_manager/maintenance_form.html'
|
template_name = 'ups_manager/maintenance_form.html'
|
||||||
fields = ['ups_host', 'battery', 'supplier', 'maintenance_date', 'technician', 'content']
|
fields = ['ups_host', 'supplier', 'maintenance_date', 'technician', 'content']
|
||||||
success_url = reverse_lazy('maintenance_list')
|
success_url = reverse_lazy('maintenance_list')
|
||||||
|
|
||||||
|
|
||||||
class MaintenanceUpdateView(UpdateView):
|
class MaintenanceUpdateView(UpdateView):
|
||||||
model = MaintenanceRecord
|
model = MaintenanceRecord
|
||||||
template_name = 'ups_manager/maintenance_form.html'
|
template_name = 'ups_manager/maintenance_form.html'
|
||||||
fields = ['ups_host', 'battery', 'supplier', 'maintenance_date', 'technician', 'content']
|
fields = ['ups_host', 'supplier', 'maintenance_date', 'technician', 'content']
|
||||||
success_url = reverse_lazy('maintenance_list')
|
success_url = reverse_lazy('maintenance_list')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user