Skip to content

서영 스튜디오 adding and adding...edited #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kohsy11 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

서영 스튜디오 adding and adding...edited #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/adminpage/templates/detailEquipment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="equip-heading">장비 수정하기</h2>
<input type="text" name="serialNumber" placeholder="{{Equipment.serialNumber}}" value="{{Equipment.serialNumber}}" required>
</div>
<div class="equip-list">
<span>현재 장비 상태</span>
<span>대여 현황</span>
<select name="borrowState">
{% if Equipment.borrowState == 0 %}
<option value="{{Equipment.borrowState}}" class="disabled" disabled selected>대여 가능</option>
Expand All @@ -48,7 +48,7 @@ <h2 class="equip-heading">장비 수정하기</h2>
</select>
</div>
<div class="equip-active">
<span>활성/비활성화</span>
<span>활성 상태</span>
<!-- {% if Equipment.isExist %}
<input type="text" class="isExist" placeholder="활성 상태" readonly>
{% else %}
Expand Down
20 changes: 10 additions & 10 deletions project/adminpage/templates/detailStudio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ <h2 class="equip-heading">스튜디오 수정하기</h2>
<input type="text" name="studioName" placeholder="{{Studio.studioName}}" value="{{Studio.studioName}}" required>
</div>
<div class="equip-list">
<span>현재 장비 상태</span>
<select name="borrowState">
{% if Studio.borrowState == 0 %}
<option value="{{Studio.borrowState}}" class="disabled" disabled selected>대여 가능</option>
{% elif Studiot.borrowState == 1 %}
<option value="{{Studio.borrowState}}" class="disabled" disabled selected>대여중</option>
{% elif Studio.borrowState == 2 %}
<option value="{{Studio.borrowState}}" class="disabled" disabled selected>연체</option>
<span>대여 현황</span>
<select name="studioState">
{% if Studio.studioState == 0 %}
<option value="{{Studio.studioState}}" class="disabled" disabled selected>대여 가능</option>
{% elif Studiot.studioState == 1 %}
<option value="{{Studio.studioState}}" class="disabled" disabled selected>대여중</option>
{% elif Studio.studioState == 2 %}
<option value="{{Studio.studioState}}" class="disabled" disabled selected>연체</option>
{% endif %}
<option value="0">대여 가능</option>
<option value="1">대여중</option>
<option value="2">연체</option>
</select>
</div>
<div class="equip-list">
<span>고장 여부</span>
<span>활성 상태</span>
{% if Studio.isExist %}
<input type="text" class="isExist" placeholder="정상 대여 가능" readonly>
{% else %}
Expand All @@ -61,7 +61,7 @@ <h2 class="equip-heading">스튜디오 수정하기</h2>
<input type="textarea" name="remark" placeholder="{{Studio.remark}}">
</div>
<div class="center">
<input type="hidden" name="equipPK" value="{{Studio.pk}}">
<input type="hidden" name="studioPK" value="{{Studio.pk}}">
<div class="btn_edit center">수정하기</button>
</div>
</form>
Expand Down
1 change: 1 addition & 0 deletions project/adminpage/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ def deleteStudio(request, studio_pk):

def detailStudio(request, studio_pk):
studio = Studio.objects.get(pk=studio_pk)
print(studio)
return render(request, 'detailStudio.html',{'studio':studio})

def brokenStudio(request, studio_pk):
Expand Down