update teachea app code

1 year ago · 1d74882e44
parent 7bfa409944
commit 1d74882e44
33 changed files with 166 additions and 1 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/EduSystem.iml
+++ b/.idea/EduSystem.iml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -0,0 +1,33 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="11">
+            <item index="0" class="java.lang.String" itemvalue="pandas" />
+            <item index="1" class="java.lang.String" itemvalue="certifi" />
+            <item index="2" class="java.lang.String" itemvalue="charset-normalizer" />
+            <item index="3" class="java.lang.String" itemvalue="tzdata" />
+            <item index="4" class="java.lang.String" itemvalue="et-xmlfile" />
+            <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="pytz" />
+            <item index="7" class="java.lang.String" itemvalue="requsets" />
+            <item index="8" class="java.lang.String" itemvalue="openpyxl" />
+            <item index="9" class="java.lang.String" itemvalue="xlwt" />
+            <item index="10" class="java.lang.String" itemvalue="urllib3" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+          <option value="N802" />
+          <option value="N803" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/EduSystem.iml" filepath="$PROJECT_DIR$/.idea/EduSystem.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/EduSystemServer/API/pycache/init.cpython-39.pyc
+++ b/EduSystemServer/API/pycache/init.cpython-39.pyc
--- a/EduSystemServer/API/pycache/admin.cpython-39.pyc
+++ b/EduSystemServer/API/pycache/admin.cpython-39.pyc
--- a/EduSystemServer/API/pycache/models.cpython-39.pyc
+++ b/EduSystemServer/API/pycache/models.cpython-39.pyc
--- a/EduSystemServer/API/pycache/urls.cpython-39.pyc
+++ b/EduSystemServer/API/pycache/urls.cpython-39.pyc
--- a/EduSystemServer/API/pycache/views.cpython-39.pyc
+++ b/EduSystemServer/API/pycache/views.cpython-39.pyc
--- a/EduSystemServer/EduSystemServer/.idea/.gitignore
+++ b/EduSystemServer/EduSystemServer/.idea/.gitignore
@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/EduSystemServer/EduSystemServer/.idea/EduSystemServer.iml
+++ b/EduSystemServer/EduSystemServer/.idea/EduSystemServer.iml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="settings.py" />
+        <option name="manageScript" value="manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+  </component>
+</module>
--- a/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/Project_Default.xml
+++ b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/Project_Default.xml
@ -0,0 +1,33 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="11">
+            <item index="0" class="java.lang.String" itemvalue="pandas" />
+            <item index="1" class="java.lang.String" itemvalue="certifi" />
+            <item index="2" class="java.lang.String" itemvalue="charset-normalizer" />
+            <item index="3" class="java.lang.String" itemvalue="tzdata" />
+            <item index="4" class="java.lang.String" itemvalue="et-xmlfile" />
+            <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="pytz" />
+            <item index="7" class="java.lang.String" itemvalue="requsets" />
+            <item index="8" class="java.lang.String" itemvalue="openpyxl" />
+            <item index="9" class="java.lang.String" itemvalue="xlwt" />
+            <item index="10" class="java.lang.String" itemvalue="urllib3" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+          <option value="N802" />
+          <option value="N803" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
--- a/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/profiles_settings.xml
+++ b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/profiles_settings.xml
@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
--- a/EduSystemServer/EduSystemServer/.idea/misc.xml
+++ b/EduSystemServer/EduSystemServer/.idea/misc.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="C:\E\anaconda3" project-jdk-type="Python SDK" />
+</project>
--- a/EduSystemServer/EduSystemServer/.idea/modules.xml
+++ b/EduSystemServer/EduSystemServer/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/EduSystemServer.iml" filepath="$PROJECT_DIR$/.idea/EduSystemServer.iml" />
+    </modules>
+  </component>
+</project>
--- a/EduSystemServer/EduSystemServer/.idea/vcs.xml
+++ b/EduSystemServer/EduSystemServer/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
--- a/EduSystemServer/EduSystemServer/pycache/init.cpython-39.pyc
+++ b/EduSystemServer/EduSystemServer/pycache/init.cpython-39.pyc
--- a/EduSystemServer/EduSystemServer/pycache/settings.cpython-39.pyc
+++ b/EduSystemServer/EduSystemServer/pycache/settings.cpython-39.pyc
--- a/EduSystemServer/EduSystemServer/pycache/urls.cpython-39.pyc
+++ b/EduSystemServer/EduSystemServer/pycache/urls.cpython-39.pyc
--- a/EduSystemServer/EduSystemServer/settings.py
+++ b/EduSystemServer/EduSystemServer/settings.py
@ -41,7 +41,11 @@ INSTALLED_APPS = [
    'Student',
    'teacher',
    'course',
+<<<<<<< Updated upstream
    'Eduadmin',
+=======
+    # 'admin1',
+>>>>>>> Stashed changes
 ]

 MIDDLEWARE = [
--- a/EduSystemServer/Student/pycache/init.cpython-39.pyc
+++ b/EduSystemServer/Student/pycache/init.cpython-39.pyc
--- a/EduSystemServer/Student/pycache/admin.cpython-39.pyc
+++ b/EduSystemServer/Student/pycache/admin.cpython-39.pyc
--- a/EduSystemServer/Student/pycache/models.cpython-39.pyc
+++ b/EduSystemServer/Student/pycache/models.cpython-39.pyc
--- a/EduSystemServer/course/pycache/init.cpython-39.pyc
+++ b/EduSystemServer/course/pycache/init.cpython-39.pyc
--- a/EduSystemServer/course/pycache/admin.cpython-39.pyc
+++ b/EduSystemServer/course/pycache/admin.cpython-39.pyc
--- a/EduSystemServer/course/pycache/models.cpython-39.pyc
+++ b/EduSystemServer/course/pycache/models.cpython-39.pyc
--- a/EduSystemServer/teacher/pycache/init.cpython-39.pyc
+++ b/EduSystemServer/teacher/pycache/init.cpython-39.pyc
--- a/EduSystemServer/teacher/pycache/admin.cpython-39.pyc
+++ b/EduSystemServer/teacher/pycache/admin.cpython-39.pyc
--- a/EduSystemServer/teacher/pycache/models.cpython-39.pyc
+++ b/EduSystemServer/teacher/pycache/models.cpython-39.pyc
--- a/EduSystemServer/teacher/models.py
+++ b/EduSystemServer/teacher/models.py
@ -3,7 +3,7 @@ from django.db import models

 # Create your models here.
 class Teacher(models.Model):
-    tid = models.AutoField(primary_key=True, verbose_name="教师编号")
+    tid = models.AutoField(primary_key=True, verbose_name="教师编号", name="tid")
    t_name = models.CharField(max_length=255, verbose_name="教师名称", name="t_name")
    sex = models.CharField(max_length=128, verbose_name="教师性别", name="t_sex")
    title = models.CharField(max_length=128, verbose_name="教师职称", name="t_title")