Merge pull request #99 from duri0214/feature/hospital/1_base

アプリケーションのベースをつくる
duri0214 · Sep 22, 2024 · 303b2b1 · 303b2b1
2 parents b819246 + 292a1cb
commit 303b2b1
Show file tree

Hide file tree

Showing 31 changed files with 290 additions and 323 deletions.
diff --git a/README.md b/README.md
@@ -209,4 +209,6 @@ Userが「食べた」と答えた回数を集計して、最近「食べた」
 ## securities report
 
 - edinet data を zip でダウンロードする
-    - `python manage.py daily_download_edinet` のバッチをまわす
+    - `python manage.py daily_download_edinet` のバッチをまわす
+
+## hospital
diff --git a/config/settings.py b/config/settings.py
@@ -45,6 +45,7 @@
     "taxonomy",
     "soil_analysis",
     "securities",
+    "hospital",
 ]
 
 MIDDLEWARE = [

diff --git a/config/urls.py b/config/urls.py
@@ -28,6 +28,7 @@
     path("taxonomy/", include("taxonomy.urls")),
     path("soil_analysis/", include("soil_analysis.urls")),
     path("securities/", include("securities.urls")),
+    path("hospital/", include("hospital.urls")),
     path("admin/", admin.site.urls),
     path("accounts/", include("django.contrib.auth.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/gmarker/static/gmarker/css/index_select2.css b/gmarker/static/gmarker/css/index_select2.css
diff --git a/gmarker/static/gmarker/js/map.js b/gmarker/static/gmarker/js/map.js
@@ -54,7 +54,7 @@ function markerEvent(i) {
 
             if (json.shops[i]['place_id'] != null) {
                 // get a shop detail
-                fetch(myurl.base + 'search/detail/' + json.shops[i]['place_id'], {
+                fetch(myUrl.base + 'search/detail/' + json.shops[i]['place_id'], {
                     method: 'POST',
                     headers: {
                         "Content-Type": "application/json; charset=utf-8",
@@ -115,7 +115,7 @@ function do_pattern2(button) {
         // blue: 登録対象のピン
         const confirm = window.confirm("登録しますか？");
         if (confirm) {
-            fetch(myurl.base + 'search/2', {
+            fetch(myUrl.base + 'search/2', {
                 method: 'POST',
                 headers: {
                     "Content-Type": "application/json; charset=utf-8",
@@ -127,7 +127,7 @@ function do_pattern2(button) {
                 .then(json => {
                     alert(json.status + ': 登録が完了しました。');
                     keep_markers = [];
-                    location.href = myurl.base + 'result/2';
+                    location.href = myUrl.base + 'result/2';
                     button.style.border = 'solid 2px';
                     button.style.color = '#67c5ff';
                 })

diff --git a/gmarker/templates/gmarker/base.html b/gmarker/templates/gmarker/base.html
@@ -36,7 +36,7 @@
     <script src="{% static 'gmarker/js/map.js' %}"></script>
 
     <!-- for ajax -->
-    <script>let myurl = {"base": "{% url 'mrk:index' %}"};</script>
+    <script>let myUrl = {"base": "{% url 'mrk:index' %}"};</script>
 </head>
 
 <body onload="mapinit('{{ unit }}')">
@@ -50,26 +50,18 @@ <h1></h1>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
-                {% if user.is_authenticated %}
-                    <li class="nav-link">{{ user.username }}さん</li>
-                {% else %}
-                    <li class="nav-link">ゲストさん</li>
-                {% endif %}
-                {% if user.is_authenticated %}
-                    <li class="nav-link"><a href="{% url 'logout' %}">LOGOUT</a></li>
-                {% else %}
-                    <li class="nav-link"><a href="{% url 'login' %}">LOGIN</a></li>
-                {% endif %}
-                <select class="select2-1" onChange="location.href=value;">
-                    <option></option>
-                    <option value="{% url 'vnm:index' %}">VIETNAM</option>
-                    <option value="{% url 'mrk:index' %}" selected>GMARKER</option>
-                    <option value="{% url 'shp:index' %}">SHOPPING</option>
-                    <option value="{% url 'war:index' %}">WAREHOUSE</option>
-                    <option value="{% url 'txo:index' %}">TAXONOMY</option>
-                    <option value="{% url 'soil:home' %}">SOIL ANALYSIS</option>
-                    <option value="{% url 'securities:index' %}">SECURITIES REPORT</option>
-                </select>
+                <li class="nav-item">
+                    <select class="custom-select d-flex align-items-center" onChange="location.href=value;">
+                        <option value="{% url 'vnm:index' %}">VIETNAM</option>
+                        <option value="{% url 'mrk:index' %}" selected>GMARKER</option>
+                        <option value="{% url 'shp:index' %}">SHOPPING</option>
+                        <option value="{% url 'war:index' %}">WAREHOUSE</option>
+                        <option value="{% url 'txo:index' %}">TAXONOMY</option>
+                        <option value="{% url 'soil:home' %}">SOIL ANALYSIS</option>
+                        <option value="{% url 'securities:index' %}">SECURITIES REPORT</option>
+                        <option value="{% url 'hsp:index' %}">HOSPITAL</option>
+                    </select>
+                </li>
             </ul>
             <form class="form-inline my-2 my-lg-0">
                 <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
@@ -96,18 +88,5 @@ <h1></h1>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
         integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
         crossorigin="anonymous"></script>
-
-<!-- for select2 -->
-<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css" rel="stylesheet"/>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
-<script>
-    $(function () {
-        $('.select2-1').select2({
-            // コントロールのプレースホルダを指定します。
-            placeholder: 'Please Select',
-        });
-    });
-</script>
-<link rel="stylesheet" href="{% static 'vietnam_research/css/index_select2.css' %}">
 </body>
 </html>
diff --git a/hospital/__init__.py b/hospital/__init__.py
diff --git a/hospital/admin.py b/hospital/admin.py
@@ -0,0 +1 @@
+# Register your models here.
diff --git a/hospital/apps.py b/hospital/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class HospitalConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "hospital"
diff --git a/hospital/models.py b/hospital/models.py
@@ -0,0 +1 @@
+# Create your models here.
diff --git a/hospital/static/hospital/c_h.ico b/hospital/static/hospital/c_h.ico
diff --git a/hospital/static/hospital/css/index.css b/hospital/static/hospital/css/index.css
@@ -0,0 +1,9 @@
+body {
+    padding-top: 48px;
+}
+
+.jumbotron li {
+    display: inline-block;
+    list-style-type: none;
+    padding-top: 4px;
+}
diff --git a/hospital/templates/hospital/base.html b/hospital/templates/hospital/base.html
@@ -0,0 +1,87 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-43097095-9"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+
+        function gtag() {
+            dataLayer.push(arguments);
+        }
+
+        gtag('js', new Date());
+        gtag('config', 'UA-43097095-9');
+    </script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+
+    <title>病院事務VBAのWeb版</title>
+
+    <!-- bootstrap and css -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
+          integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
+    <link rel="stylesheet" href="{% static 'hospital/css/index.css' %}">
+
+    <!-- font -->
+    <link href="https://fonts.googleapis.com/css?family=Sawarabi+Gothic" rel="stylesheet">
+    <!-- fontawesome -->
+    <link href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" rel="stylesheet">
+
+    <!-- favicon -->
+    <link rel="shortcut icon" href="{% static 'hospital/c_h.ico' %}">
+</head>
+<body>
+<h1></h1>
+<header>
+    <nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
+        <a class="navbar-brand" href="#">Henojiya</a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
+                aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav mr-auto">
+                <li class="nav-item">
+                    <select class="custom-select d-flex align-items-center" onChange="location.href=value;">
+                        <option value="{% url 'vnm:index' %}">VIETNAM</option>
+                        <option value="{% url 'mrk:index' %}">GMARKER</option>
+                        <option value="{% url 'shp:index' %}">SHOPPING</option>
+                        <option value="{% url 'war:index' %}">WAREHOUSE</option>
+                        <option value="{% url 'txo:index' %}">TAXONOMY</option>
+                        <option value="{% url 'soil:home' %}">SOIL ANALYSIS</option>
+                        <option value="{% url 'securities:index' %}">SECURITIES REPORT</option>
+                        <option value="{% url 'hsp:index' %}" selected>HOSPITAL</option>
+                    </select>
+                </li>
+            </ul>
+            <form class="form-inline my-2 my-lg-0">
+                <input class="form-control mr-sm-2" type="search" placeholder="alt + / で検索" aria-label="Search"
+                       accesskey="/">
+                <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
+            </form>
+        </div>
+    </nav>
+</header>
+
+<div id="main">
+    {% block content %}{% endblock %}
+</div>
+<footer>
+    <p>© 2019 henojiya. / <a href="https://github.com/duri0214" target="_blank">github portfolio</a></p>
+</footer>
+
+<!-- Optional JavaScript -->
+<!-- jQuery first, then Popper.js, then Bootstrap JS -->
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"
+        integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"
+        integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
+        crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
+        integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
+        crossorigin="anonymous"></script>
+</body>
+</html>
diff --git a/hospital/templates/hospital/index.html b/hospital/templates/hospital/index.html
@@ -0,0 +1,20 @@
+{% extends "hospital/base.html" %}
+{% load static %}
+{% load humanize %}
+{% block content %}
+    <div class="jumbotron">
+        <h1 class="display-4">Let's work at the hospital!</h1>
+        <p class="lead">improving proxi voting operations.</p>
+        <hr class="my-4">
+        <p>You can do hospital administration too.</p>
+        <ul>
+            <li><a class="btn btn-secondary btn-sm" href="#" role="button">XXXX</a></li>
+            <li><a class="btn btn-secondary btn-sm" href="#" role="button">YYYY</a></li>
+        </ul>
+    </div>
+
+    <div class="container">
+        <p>これはサンプルです</p>
+    </div>
+
+{% endblock %}
diff --git a/hospital/tests.py b/hospital/tests.py
@@ -0,0 +1 @@
+# Create your tests here.
diff --git a/hospital/urls.py b/hospital/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+
+from hospital.views import IndexView
+
+app_name = "hsp"
+urlpatterns = [
+    path("", IndexView.as_view(), name="index"),
+]
diff --git a/hospital/views.py b/hospital/views.py
@@ -0,0 +1,5 @@
+from django.views.generic import TemplateView
+
+
+class IndexView(TemplateView):
+    template_name = "hospital/index.html"
diff --git a/securities/static/securities/css/index_select2.css b/securities/static/securities/css/index_select2.css
diff --git a/securities/templates/securities/base.html b/securities/templates/securities/base.html
@@ -28,9 +28,6 @@
 
     <!-- favicon -->
     <link rel="shortcut icon" href="{% static 'securities/s_s.ico' %}">
-
-    <!-- for ajax -->
-    <script>let myurl = {"base": "{% url 'vnm:index' %}", "login": "{% url 'login' %}"};</script>
 </head>
 <body>
 <h1></h1>
@@ -43,26 +40,18 @@ <h1></h1>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
-                {% if user.is_authenticated %}
-                    <li class="nav-link">{{ user.username }}さん</li>
-                {% else %}
-                    <li class="nav-link">ゲストさん</li>
-                {% endif %}
-                {% if user.is_authenticated %}
-                    <li class="nav-link"><a href="{% url 'logout' %}">LOGOUT</a></li>
-                {% else %}
-                    <li class="nav-link"><a href="{% url 'login' %}">LOGIN</a></li>
-                {% endif %}
-                <select class="select2-1" onChange="location.href=value;">
-                    <option></option>
-                    <option value="{% url 'vnm:index' %}">VIETNAM</option>
-                    <option value="{% url 'mrk:index' %}">GMARKER</option>
-                    <option value="{% url 'shp:index' %}">SHOPPING</option>
-                    <option value="{% url 'war:index' %}">WAREHOUSE</option>
-                    <option value="{% url 'txo:index' %}">TAXONOMY</option>
-                    <option value="{% url 'soil:home' %}">SOIL ANALYSIS</option>
-                    <option value="{% url 'securities:index' %}" selected>SECURITIES REPORT</option>
-                </select>
+                <li class="nav-item">
+                    <select class="custom-select d-flex align-items-center" onChange="location.href=value;">
+                        <option value="{% url 'vnm:index' %}">VIETNAM</option>
+                        <option value="{% url 'mrk:index' %}">GMARKER</option>
+                        <option value="{% url 'shp:index' %}">SHOPPING</option>
+                        <option value="{% url 'war:index' %}">WAREHOUSE</option>
+                        <option value="{% url 'txo:index' %}">TAXONOMY</option>
+                        <option value="{% url 'soil:home' %}">SOIL ANALYSIS</option>
+                        <option value="{% url 'securities:index' %}" selected>SECURITIES REPORT</option>
+                        <option value="{% url 'hsp:index' %}">HOSPITAL</option>
+                    </select>
+                </li>
             </ul>
             <form class="form-inline my-2 my-lg-0">
                 <input class="form-control mr-sm-2" type="search" placeholder="alt + / で検索" aria-label="Search"
@@ -105,18 +94,5 @@ <h1></h1>
         });
     });
 </script>
-
-<!-- for select2 -->
-<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css" rel="stylesheet"/>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
-<script>
-    $(function () {
-        $('.select2-1').select2({
-            // コントロールのプレースホルダを指定します。
-            placeholder: 'Please Select',
-        });
-    });
-</script>
-<link rel="stylesheet" href="{% static 'securities/css/index_select2.css' %}">
 </body>
 </html>
diff --git a/shopping/static/shopping/css/index_select2.css b/shopping/static/shopping/css/index_select2.css