Skip to content
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

Jump to bottom

#866 添加对单日预约时长和同时段预约的限制，修改前端的提示信息 #868

Merged
merged 4 commits into from
Jan 20, 2025
Merged

#866 添加对单日预约时长和同时段预约的限制，修改前端的提示信息 #868

merged 4 commits into from
Jan 20, 2025

Conversation

HelloWorldZTR
Copy link

#866 添加对单日预约时长和同时段预约的限制，修改前端的提示信息

配置文件 Appointment/config.py

    # 单人单日预约总时长上限
    max_appoint_time = timedelta(hours=6)
    # 是否允许单人同一时段预约两个房间
    allow_overlap = False

image
image
image
image

@Deophius Deophius linked an issue Jan 18, 2025 that may be closed by this pull request
地下室长期占用房间使用问题 #866
Closed
Deophius
Deophius reviewed Jan 18, 2025
View reviewed changes
Copy link
Collaborator

@Deophius Deophius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app/views.py和app/admin.py是不是和这个PR的标题没关系啊🧐

在查找冲突预约和计算预约总时长的时候有些bug；组织账号的预约权限限制的有些过于严格了，可以在给前端的context里面记录一下用户类型

Appointment/utils/utils.py Show resolved Hide resolved
templates/Appointment/booking.html Show resolved Hide resolved
templates/Appointment/booking.html Show resolved Hide resolved
templates/Appointment/booking.html Outdated Show resolved Hide resolved
Appointment/utils/utils.py Show resolved Hide resolved
scripts/generate_testdata.py Outdated Show resolved Hide resolved
@HelloWorldZTR
Copy link
Author

已修改前端和后端
那个app/views.py和app/admin.py是上一次pr修复的bug，不小心又提交了一次

@Deophius Deophius merged commit bcc48bb into Yuanpei-Intelligence:develop Jan 20, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Deophius Deophius Deophius approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

地下室长期占用房间使用问题
2 participants
@HelloWorldZTR @Deophius