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

Production merge #1

Merged
merged 71 commits into from
Dec 9, 2023
Merged

Production merge #1

merged 71 commits into from
Dec 9, 2023

Conversation

Pancham1603
Copy link
Owner

No description provided.

Pancham1603 and others added 30 commits November 30, 2023 19:03
@Pancham1603
Add Dockerfile and docker-compose.yml
eda1500
@Pancham1603
Merge branch 'master' of https://github.com/Pancham1603/campus-nightpass
b00a9c4 
 into production
@Pancham1603
Merge branch 'master' of https://github.com/Pancham1603/campus-nightpass
42fa203 
 into production
@Pancham1603
added kiosk extension
348a05e
@Pancham1603
bug fix
a93ccae
@Pancham1603
updated check flow for campus_resources
2459076
@Pancham1603
minor check
e995871
@Pancham1603
minor bug fix
f7efbd7
@Pancham1603
fixed colour coding
6c9beee
@Pancham1603
bug fix
fad4a9c
@Pancham1603
integrated with library logs through req
bfb43a4
@akarsh911
Add autofocus to roll number input field
b63dc02
@Pancham1603
autofocus manual input box
522a95b
@Pancham1603
minor bug fix
9d9a4ba
@Pancham1603
allowed only one pass a day
3b71ede
@Pancham1603
bug fix
ba8a1a7
@Pancham1603
auto checkin checkout at resource
5047ad0
@Pancham1603
device based auto checkin/out
a799614
@Pancham1603
added export for nightpass
4ed4b2c
@Pancham1603
removed io from requirements
f8fc9e8
@Pancham1603
fixed timezone in nightpass export
503bdfe
@Pancham1603
added defaulters and cronjobs testing
51a4fe6
@Pancham1603
changed cron config
c7056af
@Pancham1603
crontab add
f1bad74
@Pancham1603
testing cron
473a7fd
@Pancham1603
testing linux cron
0bfcfdf
@Pancham1603
removed cron execution
77f9341
@Pancham1603
added cron jobs as commands
01dd55a
@Pancham1603
bug fix in defaulter check
8529f0b
@Pancham1603
updating violation flags if default
3d202e0
@Pancham1603
added readonly fields to admin
811da41
@Pancham1603
fixed direct check in to hostel bug
0df79ec
@Pancham1603
modified default times
6f6ca00
@Pancham1603
updated toastr options
a10cb13
@Pancham1603
added basic stats for campus_resource scanning
76544fd
@Pancham1603
Fix model field default value
7cde5ff
@Pancham1603
Update NightPass validity based on previous day's
d5f2a4c 
data
@Pancham1603
Fix NightPass filter in reset_nightpass.py
7e5af09
@Pancham1603
added readonly fields to student
4201dad
@Pancham1603
Fix defaulters check logic in check_defaulters.py
6263c26
@Pancham1603
Update defaulter status and remarks for previous
498aedf 
day's night passes
@Pancham1603
Add defaulter_email template and update
fad8c53 
check_defaulters command
@Pancham1603
Update search fields and list filter in
7fe4070 
NightPassAdmin
@Pancham1603
Add hostel field to NightPassAdmin list_display
d1e04de
@Pancham1603
Fix barcode scanning and update lastScannedBarcode
c68c9ce 
variable
@Pancham1603
preventing unwanted duplicate scan
056806d
@Pancham1603
Update toast position in lmao.html
77c813f
@Pancham1603
added gender field to student model
a20816b
@Pancham1603
force int to import values
4ec4b3c
@Pancham1603
fixed bug in preventing duplicate scan
5eae424
@Pancham1603
fixed duplicate scan message
31c8a9a
@Pancham1603
fixed manual pass delete non coherency
f9d98a9
@Pancham1603
Fix checkout_from_location function parameter
7eb5d09
@Pancham1603
Update reset_users.py to set has_booked=False
e7fb325
@Pancham1603
Add notification verification and cancel booking confirmation
09ed4af
@Pancham1603
Update notification text for nightpass facility
7f790ff
@Pancham1603
Add default incident view in nightpass home
ac92f8b
@Pancham1603
Add conditional rendering for user incidents in lmao.html
abab270
@Pancham1603
Add cannot cancel_pass after 8pm
6e5ab52
@Pancham1603 Pancham1603 merged commit b3c6c44 into master Dec 9, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@Pancham1603 @akarsh911