diff --git a/.gitignore b/.gitignore index 55a0b7c..0170d1f 100644 --- a/.gitignore +++ b/.gitignore @@ -206,4 +206,5 @@ pyvenv.cfg pip-selfcheck.json .idea # End of https://www.toptal.com/developers/gitignore/api/venv,dotenv,intellij,pycharm -serviceCRM/__pycache__ \ No newline at end of file +__pycache__/ +*.py[cod] \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..99cf7ae --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,19 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Python Debugger: Django", + "type": "debugpy", + "request": "launch", + "program": "${workspaceFolder}\\manage.py", + "args": [ + "runserver" + ], + "django": true, + "autoStartBrowser": false + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cad7657 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.configureOnOpen": false +} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f9fd274..b51db47 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/serviceCRM/urls.py b/serviceCRM/urls.py index d84b085..15924fe 100644 --- a/serviceCRM/urls.py +++ b/serviceCRM/urls.py @@ -23,5 +23,4 @@ urlpatterns = [ path('admin/', admin.site.urls), path("/", view.ReportById.ReportById, name="detail"), path("insert/", view.InsertNew.insert, name="insert"), - path("done/", view.done, name="done"), -] + path("done//", view.done, name="done"),] diff --git a/serviceCRM/views.py b/serviceCRM/views.py index 6753d81..6c16e18 100644 --- a/serviceCRM/views.py +++ b/serviceCRM/views.py @@ -21,13 +21,12 @@ def index(request): # class ReportById(generic.DetailView): model = Insert - template_name = "serviceCRM/id.html" + template_name = "serviceCRM/python.exe -m pip install --upgrade pipid.html" def ReportById(request, question_id): req = get_object_or_404(Insert, id=question_id) context = {"name": req.name, "phone": req.phone, "desc": req.description, "date": req.date} - return HttpResponse(render(request, ReportById.template_name, context)) - + return HttpResponse(f"Report ID: {question_id} \nName: {req.name} \nPhone: {req.phone} \nDescription: {req.description} \nDate: {req.date} \nDone: {req.done}") class InsertNew(generic.View): model = Insert @@ -48,11 +47,11 @@ class InsertNew(generic.View): class TableView(SingleTableView): model = Insert - table_class = InsertTable template_name = "serviceCRM/list.html" -def done(request, question_id): - req = get_object_or_404(Insert, id=question_id) + +def done(request, id): + req = get_object_or_404(Insert, id=id) if req.isDone(): return HttpResponse("Done") return HttpResponse("Not Done")