Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ef01d6e
get_location_for_new_order
siued Feb 17, 2024
cc07270
get_human_readable_location
siued Feb 17, 2024
f898c45
location_manager
siued Feb 17, 2024
3a6cbfc
Merge pull request #1 from siued/warehouse-matej
siued Feb 17, 2024
2aebff0
get_order function
siued Feb 17, 2024
03faeef
wms
siued Feb 17, 2024
4a99167
add_items
siued Feb 17, 2024
e8608ab
small changes
siued Feb 17, 2024
afa0475
gitignore
siued Feb 17, 2024
3d6241b
Merge pull request #2 from siued/warehouse-matej
siued Feb 17, 2024
49e8b00
intermediate commit to pull other branches
akseljoonas Feb 17, 2024
3140894
Merge pull request #3 from siued/warehouse-matej
akseljoonas Feb 17, 2024
932a8a6
get_order fix
siued Feb 17, 2024
d3f3bbf
process order basic
squidistaken Feb 17, 2024
4836d4f
Merge pull request #4 from siued/process-order-marcus
squidistaken Feb 17, 2024
1d162b3
db_connection added
HermanD9722 Feb 17, 2024
5239e6b
fix syntax
squidistaken Feb 17, 2024
adcdb47
sql
Ash9203232003 Feb 17, 2024
fd042b8
change prints in process order
siued Feb 17, 2024
26b755a
Merge branch 'main' of github.com:siued/belsimpel-hackathon-2024
siued Feb 17, 2024
dc67dd6
fixes
squidistaken Feb 17, 2024
e5d6bc0
Merge branch 'main' of https://github.com/siued/belsimpel-hackathon-2024
Ash9203232003 Feb 17, 2024
168161a
Merge pull request #5 from siued/main
akseljoonas Feb 17, 2024
9e8db8d
update stock manager
akseljoonas Feb 17, 2024
728eb6f
Merge branch 'stock-manager-aksel' of https://github.com/siued/belsim…
akseljoonas Feb 17, 2024
7329ea5
tweaks
squidistaken Feb 17, 2024
94dc0be
Merge pull request #6 from siued/wms-tweaks
squidistaken Feb 17, 2024
3ff6980
fix name
Ash9203232003 Feb 17, 2024
33c41fd
Merge branch 'main' of https://github.com/siued/belsimpel-hackathon-2024
Ash9203232003 Feb 17, 2024
f778c18
fix not null
Ash9203232003 Feb 17, 2024
735e8a4
fixes to add_items location_manager stock_manager and wms
akseljoonas Feb 17, 2024
6c45984
Merge branch 'stock-manager-aksel' into main
akseljoonas Feb 17, 2024
dfb9129
Merge pull request #7 from siued/main
akseljoonas Feb 17, 2024
4c6725d
fixed until database controller
akseljoonas Feb 17, 2024
a69f8aa
stylistic changes
akseljoonas Feb 17, 2024
6827921
db controller functions
siued Feb 17, 2024
aa62174
db connector
akseljoonas Feb 17, 2024
79361d9
db controller, stock controller
siued Feb 17, 2024
49915b9
update table
Ash9203232003 Feb 17, 2024
6dc3330
Merge branch 'main' of https://github.com/siued/belsimpel-hackathon-2024
Ash9203232003 Feb 17, 2024
aa41fb7
Merge branch 'main' into stock-manager-aksel
akseljoonas Feb 17, 2024
2c15f56
Merge pull request #9 from siued/stock-manager-aksel
akseljoonas Feb 17, 2024
14d0012
assignment-2
squidistaken Feb 17, 2024
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 .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=admin123
MYSQL_DATABASE=belsimpel_hackathon
MYSQL_USER=my_username
MYSQL_PASSWORD=my_password
MYSQL_USER=admin
MYSQL_PASSWORD=admin
348 changes: 348 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,348 @@
# Created by https://www.toptal.com/developers/gitignore/api/python,macos,windows,pycharm
# Edit at https://www.toptal.com/developers/gitignore?templates=python,macos,windows,pycharm

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### macOS Patch ###
# iCloud generated files
*.icloud

### PyCharm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### PyCharm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

### Python Patch ###
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
poetry.toml

# ruff
.ruff_cache/

# LSP config files
pyrightconfig.json

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/python,macos,windows,pycharm
6 changes: 6 additions & 0 deletions assignment/add_items.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import stock_manager


def add_items(items):
for item in items:
stock_manager.add_new_item_to_database(item)
18 changes: 18 additions & 0 deletions assignment/check_order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import db_connection as database

def check_order():
while True:
order_id = input("Input the order ID, type exit to exit: ")
match order_id:
case "exit":
print("Stopped searching for order")
break
case "":
print("Must have a correct order ID")
case _:
items = database.get_order()
if items is None:
print("There is no order attached to that ID.")
else:
print(items)
return
Loading