Skip to content

Commit

Permalink
HOTFIX: Meeting delete가 안되는 문제 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyxklee
hyxklee committed Aug 15, 2024
1 parent 05a1a52 commit 4c1ccfd
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/main/resources/static/js/account.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ function setModalContent(type) {
<form id="totalAccountForm">
<div class="form-group">
<label for="totalCardinal">기수</label>
<input type="number" class="form-control" id="totalCardinal" placeholder="기수 입력" required>
<input type="number" class="form-control" id="totalCardinal" placeholder="기수 입력" min="1" required>
</div>
<div class="form-group">
<label for="totalDescription">설명</label>
<input type="text" class="form-control" id="totalDescription" placeholder="설명 입력" required>
<input type="text" class="form-control" id="totalDescription" placeholder="설명 입력: ex(3기 회비 등록)" required>
</div>
<div class="form-group">
<label for="totalAmount">총 금액</label>
<input type="text" class="form-control" id="totalAmount" placeholder="총 금액 입력" required>
<input type="number" class="form-control" id="totalAmount" placeholder="총 금액 입력" min="0" required>
</div>
</form>
`;
Expand Down
19 changes: 16 additions & 3 deletions src/main/resources/static/js/meeting.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ document.addEventListener('DOMContentLoaded', function () {
}
document.getElementById('topbarSearchInput').addEventListener('input', filterMeetings);

document.getElementById('updateCardinal').addEventListener('input', function (e) {
if (e.target.value < 1) {
e.target.value = 1;
}
});

document.getElementById('cardinal').addEventListener('input', function (e) {
if (e.target.value < 1) {
e.target.value = 1;
}
});

document.getElementById('meetingForm').addEventListener('submit', function (event) {
event.preventDefault();
if (!confirm('출석 일정을 저장하시겠습니까?')) {
Expand Down Expand Up @@ -81,6 +93,7 @@ function displayMeetings(meetingArray) {
</a>
<div class="collapse" id="${collapseId}">
<div class="card-body">
<p><strong>ID:</strong> ${meeting.id}</p>
<p><strong>제목:</strong> ${meeting.title}</p>
<p><strong>주차:</strong> ${meeting.weekNumber}</p>
<p><strong>출석 가능 시간:</strong> ${formatTime(meeting.start)} - ${formatTime(meeting.end)}</p>
Expand Down Expand Up @@ -248,12 +261,12 @@ function closeAttendance(date, cardinal){
});
}

function deleteMeeting(){
function deleteMeeting(meetingId){
if (!confirm('정기모임을 삭제하시겠습니까? 삭제된 정기모임에 해당하는 출석을 체크하지 못하게 됩니다.')) {
return;
}

apiRequest(`${apiEndpoint}/admin/meetings/${currentMeetingId}`,{
apiRequest(`${apiEndpoint}/admin/meetings/${meetingId}`,{
method: 'DELETE',
headers: {
'Content-Type': 'application/json'
Expand Down Expand Up @@ -308,7 +321,7 @@ function setModalContent(meetingId) {
</div>
<div class="form-group">
<label for="updateCardinal">기수</label>
<input type="number" class="form-control" id="updateCardinal" placeholder="기수 입력" value="${meeting.cardinal}">
<input type="number" class="form-control" id="updateCardinal" placeholder="기수 입력" value="${meeting.cardinal}" min="1" step="1">
</div>
<button type="submit" class="btn btn-primary" id="submitMeetingButton">제출</button>
</form>
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/account.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h5 class="m-0 font-weight-bold text-success">회비 조회</h5>
</div>
<div class="card-body">
<div class="input-group mb-3">
<input type="number" class="form-control" id="checkCardinal" placeholder="기수 입력" required>
<input type="number" class="form-control" id="checkCardinal" placeholder="기수 입력" min="1" required>
<div class="input-group-append">
<button id="checkAccountButton" class="btn btn-secondary" onclick="checkAccount()">회비 조회</button>
</div>
Expand All @@ -53,15 +53,15 @@ <h5 class="m-0 font-weight-bold text-success">회비 사용 내역 입력</h5>
<form id="receiptForm">
<div class="form-group">
<label for="cardinal">기수</label>
<input type="number" class="form-control" id="cardinal" placeholder="기수 입력" required>
<input type="number" class="form-control" id="cardinal" placeholder="기수 입력" min="1" required>
</div>
<div class="form-group">
<label for="amount">사용 금액</label>
<input type="number" class="form-control" id="amount" placeholder="사용 금액 입력" required>
<input type="number" class="form-control" id="amount" placeholder="사용 금액 입력" min="0" required>
</div>
<div class="form-group">
<label for="description">사용 내역</label>
<input type="text" class="form-control" id="description" placeholder="사용 내역 입력" required>
<input type="text" class="form-control" id="description" placeholder="설명 입력" required>
</div>
<div class="form-group">
<label for="date">날짜</label>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/meeting.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h5 class="m-0 font-weight-bold text-success">정기모임 입력</h5>
<form id="meetingForm">
<div class="form-group">
<label for="title">제목</label>
<input type="text" class="form-control" id="title" placeholder="제목 입력" required>
<input type="text" class="form-control" id="title" placeholder="제목 입력: ex(O주차 정기모임)" required>
</div>
<div class="form-group">
<label for="weekNumber">주차</label>
Expand All @@ -69,7 +69,7 @@ <h5 class="m-0 font-weight-bold text-success">정기모임 입력</h5>
</div>
<div class="form-group">
<label for="cardinal">기수</label>
<input type="number" class="form-control" id="cardinal" placeholder="기수 입력" required>
<input type="number" class="form-control" id="cardinal" placeholder="기수 입력" min="1" step="1" required>
</div>
<button type="submit" class="btn btn-primary" id="submitEventButton">제출</button>
</form>
Expand Down

0 comments on commit 4c1ccfd

Please sign in to comment.