arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 01:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into duplicate_asset

Browse Source
This commit is contained in:
Johnathan Graydon
2019-01-13 16:49:03 +00:00
parent c0a7e962b7 7478068a14
commit 9480f697ff
2 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models.py
View File

@@ -44,10 +44,10 @@ class BaseAsset(models.Model):
asset_id = models.CharField(max_length=10) asset_id = models.CharField(max_length=10)
description = models.CharField(max_length=120) description = models.CharField(max_length=120)
category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE) category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE, default='Active') status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
serial_number = models.CharField(max_length=150, blank=True) serial_number = models.CharField(max_length=150, blank=True)
purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True) purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True)
date_acquired = models.DateField(default=datetime.date.today().strftime('%d %b %Y')) date_acquired = models.DateField()
date_sold = models.DateField(blank=True, null=True) date_sold = models.DateField(blank=True, null=True)
purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10) purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10) salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)

11
templates/asset_update.html
View File

@@ -30,8 +30,10 @@
{% if edit %} {% if edit %}
{# <input type="submit" class="btn" value="Save">#} {# <input type="submit" class="btn" value="Save">#}
<button type="button" class="btn" onclick="updateAsset()">Save</button> <button type="button" class="btn" onclick="updateAsset()">Save</button>
{% if object.pk %}
<a class="waves-effect waves-light btn" <a class="waves-effect waves-light btn"
href="{% url 'asset_duplicate' object.pk %}">Duplicate</a> href="{% url 'asset_duplicate' object.pk %}">Duplicate</a>
{% endif %}
{% elif duplicate %} {% elif duplicate %}
<button type="button" class="btn" onclick="updateAsset()">Create Duplicate</button> <button type="button" class="btn" onclick="updateAsset()">Create Duplicate</button>
<a href="{% url 'index' %}" class="btn">Cancel</a> <a href="{% url 'index' %}" class="btn">Cancel</a>
@@ -88,7 +90,7 @@
<select name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required> <select name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
{% for id, choice in form.status.field.choices %} {% for id, choice in form.status.field.choices %}
<option value="{{ id }}" <option value="{{ id }}"
{% if object.status.id == id %}selected{% endif %}>{{ choice }}</option> {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
{% endfor %} {% endfor %}
</select> </select>
<label for="{{ form.status.id_for_label }}" class="bold-text">Status</label> <label for="{{ form.status.id_for_label }}" class="bold-text">Status</label>
@@ -104,7 +106,6 @@
<label for="{{ form.comments.id_for_label }}">Comments</label> <label for="{{ form.comments.id_for_label }}">Comments</label>
</div> </div>
</div>
{% else %} {% else %}
<dt>Asset ID</dt> <dt>Asset ID</dt>
<dd>{{ object.asset_id }}</dd> <dd>{{ object.asset_id }}</dd>
@@ -160,9 +161,15 @@
</div> </div>
<div class="input-field col s12"> <div class="input-field col s12">
{% if object.date_acquired %}
{% render_field form.date_acquired|add_class:'datepicker' value=object.date_acquired|date %} {% render_field form.date_acquired|add_class:'datepicker' value=object.date_acquired|date %}
{% else %}
<input type="text" name="date_acquired" value="{% now "DATE_FORMAT" %}"
class="datepicker" id="id_date_acquired">
{% endif %}
<label for="{{ form.date_acquired.id_for_label }}" class="bold-text">Date <label for="{{ form.date_acquired.id_for_label }}" class="bold-text">Date
Acquired</label> Acquired</label>
</div> </div>
<div class="input-field col s12"> <div class="input-field col s12">