From c7b02e64e6e396cea50e61873fce8801fb23aed6 Mon Sep 17 00:00:00 2001
From: Bornyto Hamonangen <t-bornyto.hamonangan@virgoku.id>
Date: Mon, 5 Jun 2023 16:45:17 +0700
Subject: [PATCH 1/2] improve name clarity
---
templates/createPi.html | 6 +++---
templates/createPiDosen.html | 4 ++--
templates/createProceeding.html | 6 +++---
templates/createProceedingDosen.html | 4 ++--
templates/createSm.html | 6 +++---
templates/updatePi.html | 4 ++--
templates/updatePiDosen.html | 2 +-
templates/updateProceeding.html | 4 ++--
templates/updateProceedingDosen.html | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/templates/createPi.html b/templates/createPi.html
index 01f134e..cf36566 100644
--- a/templates/createPi.html
+++ b/templates/createPi.html
@@ -35,13 +35,13 @@
</div>
</div>
<div class="form-group row">
- <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+ <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
<div class="col-sm-9">
- <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+ <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
</div>
</div>
<div id="autocomplete" class="form-group row">
- <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+ <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
<ul class="autocomplete-result-list" ></ul>
diff --git a/templates/createPiDosen.html b/templates/createPiDosen.html
index 108b0d5..1bfe493 100644
--- a/templates/createPiDosen.html
+++ b/templates/createPiDosen.html
@@ -36,9 +36,9 @@
</div>
</div>
<div class="form-group row">
- <label for="{{ form.judul.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+ <label for="{{ form.judul.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
<div class="col-sm-9">
- <input type="text" class="form-control" id="{{ form.judul.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+ <input type="text" class="form-control" id="{{ form.judul.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.dosen.nama_lengkap }}">
</div>
</div>
<div id="autocomplete" class="form-group row">
diff --git a/templates/createProceeding.html b/templates/createProceeding.html
index bf00e86..3456449 100644
--- a/templates/createProceeding.html
+++ b/templates/createProceeding.html
@@ -36,13 +36,13 @@
</div>
</div>
<div class="form-group row">
- <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+ <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
<div class="col-sm-9">
- <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+ <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
</div>
</div>
<div id="autocomplete" class="form-group row">
- <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+ <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
<ul class="autocomplete-result-list" ></ul>
diff --git a/templates/createProceedingDosen.html b/templates/createProceedingDosen.html
index dd5d643..93335bc 100644
--- a/templates/createProceedingDosen.html
+++ b/templates/createProceedingDosen.html
@@ -36,9 +36,9 @@
</div>
</div>
<div class="form-group row">
- <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+ <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
<div class="col-sm-9">
- <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+ <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.dosen.nama_lengkap }}">
</div>
</div>
<div id="autocomplete" class="form-group row">
diff --git a/templates/createSm.html b/templates/createSm.html
index dd0ad07..0852774 100644
--- a/templates/createSm.html
+++ b/templates/createSm.html
@@ -35,13 +35,13 @@
</div>
</div>
<div class="form-group row">
- <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama</label>
+ <label for="{{ form.nama.id_for_label }}" class="col-sm-3 col-form-label">Nama Lengkap</label>
<div class="col-sm-9">
- <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')">
+ <input type="text" class="form-control" id="{{ form.nama.id_for_label }}" name="{{ form.nama.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')" value="{{ request.user.mahasiswa.nama_lengkap }}">
</div>
</div>
<div id="autocomplete" class="form-group row">
- <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen</label>
+ <label for="{{ form.dosen.id_for_label }}" class="col-sm-3 col-form-label">Dosen Pembimbing</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ form.dosen.id_for_label }}" name="{{ form.dosen.name }}" required oninvalid="this.setCustomValidity('Please fill out this field')" oninput="this.setCustomValidity('')"/>
<ul class="autocomplete-result-list" ></ul>
diff --git a/templates/updatePi.html b/templates/updatePi.html
index 75aa382..8661d73 100644
--- a/templates/updatePi.html
+++ b/templates/updatePi.html
@@ -41,11 +41,11 @@
<input type="text" class="form-control" id="topik" name="topik" value="{{ pi.topik }}">
</div>
<div class="form-group">
- <label for="nama">Nama:</label>
+ <label for="nama">Nama Lengkap:</label>
<input type="text" class="form-control" id="nama" name="nama" value="{{ pi.nama }}">
</div>
<div id="autocomplete" class="form-group">
- <label for="dosen">Dosen:</label>
+ <label for="dosen">Dosen Pembimbing:</label>
<input type="text" class="form-control" id="dosen" name="dosen" value="{{ pi.dosen }}">
<ul class="autocomplete-result-list" ></ul>
</div>
diff --git a/templates/updatePiDosen.html b/templates/updatePiDosen.html
index 02d2ee9..7109e91 100644
--- a/templates/updatePiDosen.html
+++ b/templates/updatePiDosen.html
@@ -40,7 +40,7 @@
<input type="text" class="form-control" id="topik" name="topik" value="{{ pi.topik }}">
</div>
<div class="form-group">
- <label for="nama">Nama:</label>
+ <label for="nama">Nama Lengkap:</label>
<input type="text" class="form-control" id="nama" name="nama" value="{{ pi.nama }}">
</div>
<div id="autocomplete" class="form-group">
diff --git a/templates/updateProceeding.html b/templates/updateProceeding.html
index 7a8ac23..9f88060 100644
--- a/templates/updateProceeding.html
+++ b/templates/updateProceeding.html
@@ -40,11 +40,11 @@
<input type="text" class="form-control" id="topik" name="topik" value="{{ proceeding.topik }}">
</div>
<div class="form-group">
- <label for="nama">Nama:</label>
+ <label for="nama">Nama Lengkap:</label>
<input type="text" class="form-control" id="nama" name="nama" value="{{ proceeding.nama }}">
</div>
<div id="autocomplete" class="form-group">
- <label for="dosen">Dosen:</label>
+ <label for="dosen">Dosen Pembimbing:</label>
<input type="text" class="form-control" id="dosen" name="dosen" value="{{ proceeding.dosen }}">
<ul class="autocomplete-result-list" ></ul>
</div>
diff --git a/templates/updateProceedingDosen.html b/templates/updateProceedingDosen.html
index fd96482..29194c7 100644
--- a/templates/updateProceedingDosen.html
+++ b/templates/updateProceedingDosen.html
@@ -40,7 +40,7 @@
<input type="text" class="form-control" id="topik" name="topik" value="{{ proceeding.topik }}">
</div>
<div class="form-group">
- <label for="nama">Nama:</label>
+ <label for="nama">Nama Lengkap:</label>
<input type="text" class="form-control" id="nama" name="nama" value="{{ proceeding.nama }}">
</div>
<div id="autocomplete" class="form-group">
--
GitLab
From 493a6704a11026bb59c93856e3d94b031e41f7f6 Mon Sep 17 00:00:00 2001
From: Bornyto Hamonangen <t-bornyto.hamonangan@virgoku.id>
Date: Mon, 5 Jun 2023 22:48:10 +0700
Subject: [PATCH 2/2] add nama mahasiswa and dosen in search sm admin table
---
templates/searchResultSmAdmin.html | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/searchResultSmAdmin.html b/templates/searchResultSmAdmin.html
index 65b8dfc..e674414 100644
--- a/templates/searchResultSmAdmin.html
+++ b/templates/searchResultSmAdmin.html
@@ -60,8 +60,10 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
<thead>
<tr>
<th onclick="sortTable(0)">Semester ↑</th>
- <th onclick="sortTable(1)">Judul ↑</th>
- <th onclick="sortTable(2)">Topik ↑</th>
+ <th onclick="sortTable(1)">Nama ↑</th>
+ <th onclick="sortTable(2)">Pembimbing ↑</th>
+ <th onclick="sortTable(3)">Judul ↑</th>
+ <th onclick="sortTable(4)">Topik ↑</th>
<th>PDF Studi</th>
</tr>
</thead>
@@ -69,6 +71,8 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
<tr>
<form method="get">
<td>{% render_field sm_filter.form.semester class="form-control" %}</td>
+ <td>{% render_field sm_filter.form.nama class="form-control" %}</td>
+ <td>{% render_field sm_filter.form.dosen class="form-control" %}</td>
<td>{% render_field sm_filter.form.judul class="form-control" %}</td>
<td>{% render_field sm_filter.form.topik class="form-control" %}</td>
<td colspan="2"><button type="submit" class="btn btn-primary">
@@ -79,6 +83,8 @@ box-shadow: 0 0 40px rgba(51, 51, 51, .1);
{% for sms in sm_filter.qs %}
<tr>
<td>{{ sms.semester }}</td>
+ <td>{{ sms.nama }}</td>
+ <td>{{ sms.dosen }}</td>
<td><a href="{% url 'detail_sm_admin' id=sms.id %}">{{sms.judul}}</a></td>
<td>{{ sms.topik }}</td>
<td>{% if sms.pdf %}
--
GitLab