filter grade and subject

Author: xfsaid

.gitignore

@@ -23,6 +23,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+.idea/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

db.sqlite3

@@ -1,25 +1,17 @@
 # -*- coding: UTF-8 -*-
 
 from django.contrib import admin
-from .models import Article,Person,TeacherInfo,GradeSubjectMenu,GradeInfo,SubjectInfo
+from .models import Teacher,GradeSubject,Subject
 
 # Register your models here.
 # fields = ('subject_name','intro')#排除一些不想被其他人编辑[不填]的fields
 # search_fields = ('subject_name','slug','intro')
 
-class ArticleAdmin(admin.ModelAdmin):
-    list_display = ('title','pub_date','update_time',)
 
-class PersonAdmin(admin.ModelAdmin):
-    list_display = ('full_name',)
+class TeacherAdmin(admin.ModelAdmin):
+    list_display = ('first_name','last_name')
 
-class TeacherInfoAdmin(admin.ModelAdmin):
-    list_display = ('tec_title',)
-
-class GradeSubjectMenuAdmin(admin.ModelAdmin):
-    list_display = ('display',)
-
-class GradeInfoAdmin(admin.ModelAdmin):
+class GradeSubjectAdmin(admin.ModelAdmin):
     list_display = ('level','slug','intro')
     filter_horizontal = ('subject',)
 
@@ -29,10 +21,6 @@ class SubjectInfoAdmin(admin.ModelAdmin):
 
 
 
-
-admin.site.register(Article,ArticleAdmin)
-admin.site.register(Person,PersonAdmin)
-admin.site.register(TeacherInfo,TeacherInfoAdmin)
-admin.site.register(GradeSubjectMenu,GradeSubjectMenuAdmin)
-admin.site.register(GradeInfo,GradeInfoAdmin)
-admin.site.register(SubjectInfo,SubjectInfoAdmin)
+admin.site.register(Teacher,TeacherAdmin)
+admin.site.register(GradeSubject,GradeSubjectAdmin)
+admin.site.register(Subject,SubjectInfoAdmin)

homepage/admin.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2017-07-30 03:01
+# Generated by Django 1.10.1 on 2017-08-09 16:32
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,17 +15,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Article',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=256, verbose_name='title')),
-                ('content', models.TextField(verbose_name='content')),
-                ('pub_date', models.DateTimeField(auto_now_add=True, verbose_name='publish-time')),
-                ('update_time', models.DateTimeField(auto_now=True, null=True, verbose_name='update-time')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='GradeInfo',
+            name='GradeSubject',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('level', models.CharField(max_length=100, verbose_name='\u5e74\u7ea7\u7b49\u7ea7')),
@@ -33,25 +24,7 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='GradeSubjectMenu',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tab_grade', models.CharField(max_length=20)),
-                ('tab_grade_dsc', models.CharField(max_length=20)),
-                ('tab_subject', models.CharField(max_length=20)),
-                ('tab_subject_dsc', models.CharField(max_length=20)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Person',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('first_name', models.CharField(max_length=50)),
-                ('last_name', models.CharField(max_length=50)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='SubjectInfo',
+            name='Subject',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('subject_name', models.CharField(max_length=100, verbose_name='\u79d1\u76ee\u540d\u79f0')),
@@ -60,22 +33,28 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='TeacherInfo',
+            name='Teacher',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tec_title', models.CharField(max_length=100)),
-                ('tec_age', models.IntegerField(default=0)),
-                ('tec_area', models.CharField(max_length=50)),
-                ('tec_info', models.CharField(max_length=200)),
-                ('tec_limit_price', models.FloatField(default=0)),
-                ('tec_max_price', models.FloatField(default=0)),
-                ('tec_evaluation_num', models.IntegerField(default=0)),
-                ('tec_other_info', models.CharField(max_length=100)),
+                ('first_name', models.CharField(max_length=50)),
+                ('last_name', models.CharField(max_length=50)),
+                ('age', models.IntegerField(default=0)),
+                ('gender', models.CharField(choices=[('S', 'Sec'), ('M', 'Male'), ('F', 'Female')], max_length=2)),
+                ('area', models.CharField(max_length=50)),
+                ('info', models.CharField(max_length=200)),
+                ('limit_price', models.FloatField(default=0)),
+                ('max_price', models.FloatField(default=0)),
+                ('evaluation_num', models.IntegerField(default=0)),
+                ('other_info', models.CharField(max_length=100)),
+                ('pub_date', models.DateTimeField(auto_now_add=True, verbose_name='publish-time')),
+                ('update_time', models.DateTimeField(auto_now=True, null=True, verbose_name='update-time')),
+                ('skill', models.ManyToManyField(to='homepage.GradeSubject', verbose_name='\u6280\u80fd')),
+                ('skill2', models.ForeignKey(default='default', on_delete=django.db.models.deletion.CASCADE, to='homepage.Subject', verbose_name='\u6280\u80fd2')),
             ],
         ),
         migrations.AddField(
-            model_name='gradeinfo',
+            model_name='gradesubject',
             name='subject',
-            field=models.ManyToManyField(to='homepage.SubjectInfo', verbose_name='\u79d1\u76ee\u5217\u8868'),
+            field=models.ManyToManyField(to='homepage.Subject', verbose_name='\u79d1\u76ee\u5217\u8868'),
         ),
     ]

homepage/migrations/0001_initial.py

@@ -1,57 +1,26 @@
 # -*- coding: UTF-8 -*-
 
 from __future__ import unicode_literals
-
 from django.db import models
 
 # Create your models here.
-class Article(models.Model):
-    title = models.CharField('title', max_length=256)
-    content = models.TextField('content')
+# class Article(models.Model):
+#     title = models.CharField('title', max_length=256)
+#     content = models.TextField('content')
 
-    pub_date = models.DateTimeField('publish-time', auto_now_add=True, editable = True)
-    update_time = models.DateTimeField('update-time',auto_now=True, null=True)
+#     pub_date = models.DateTimeField('publish-time', auto_now_add=True, editable = True)
+#     update_time = models.DateTimeField('update-time',auto_now=True, null=True)
 
-    def __unicode__(self):
-        return self.title
-
-class Person(models.Model):
-    first_name = models.CharField(max_length=50)
-    last_name = models.CharField(max_length=50)
- 
-    def my_property(self):
-        return self.first_name + ' ' + self.last_name
-    my_property.short_description = "Full name of the person"
-    full_name = property(my_property)
+#     def __unicode__(self):
+#         return self.title
 
-class TeacherInfo(models.Model):
-    tec_title = models.CharField(max_length=100)
-    tec_age = models.IntegerField(default=0)
-    tec_area = models.CharField(max_length=50)
-    tec_info = models.CharField(max_length=200)
-    tec_limit_price = models.FloatField(default=0)
-    tec_max_price = models.FloatField(default=0)
-    tec_evaluation_num = models.IntegerField(default=0)
-    tec_other_info = models.CharField(max_length=100)
-
-    def __unicode__(self):
-        return self.tec_title
-
-class GradeSubjectMenu(models.Model):
-    tab_grade = models.CharField(max_length=20)
-    tab_grade_dsc = models.CharField(max_length=20)
-    tab_subject = models.CharField(max_length=20)
-    tab_subject_dsc = models.CharField(max_length=20)
+GENDER_CHOICES = (
+    ('S', 'Sec'),
+    ('M', 'Male'),
+    ('F', 'Female'),
+)
 
-    def my_property(self):
-        return self.tab_grade + '-' + self.tab_subject
-    my_property.short_description = "Grade Subject"
-    display = property(my_property)
-
-    def __unicode__(self):
-        return self.my_property()
-    
-class SubjectInfo(models.Model):
+class Subject(models.Model):
     #grade_level = models.ForeignKey(Grade, verbose_name='所属年级')
     subject_name = models.CharField("科目名称",max_length = 100)
     slug = models.CharField("科目地址",max_length = 100)
@@ -65,11 +34,32 @@ class SubjectInfo(models.Model):
     def __unicode__(self):
         return self.subject_name#在路径地址中有显示
 
-class GradeInfo(models.Model):
+class GradeSubject(models.Model):
     level = models.CharField("年级等级",max_length = 100)
     slug = models.CharField("等级地址",max_length = 100)
     intro = models.CharField("等级介绍",max_length = 100)
-    subject = models.ManyToManyField(SubjectInfo,verbose_name = "科目列表")
+    subject = models.ManyToManyField(Subject,verbose_name = "科目列表")
+
+    def __unicode__(self):
+        return self.level
+
+
+class Teacher(models.Model):
+    first_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
+    age = models.IntegerField(default=0)
+    gender = models.CharField(max_length=2, choices=GENDER_CHOICES)
+    area = models.CharField(max_length=50)
+    info = models.CharField(max_length=200)
+    limit_price = models.FloatField(default=0)
+    max_price = models.FloatField(default=0)
+    evaluation_num = models.IntegerField(default=0)
+    skill = models.ManyToManyField(GradeSubject,verbose_name = "grade_subject")
+    skill2 = models.ForeignKey(Subject,default='default',verbose_name = "subject")
+    other_info = models.CharField(max_length=100)
+
+    pub_date = models.DateTimeField('publish-time', auto_now_add=True, editable = True)
+    update_time = models.DateTimeField('update-time',auto_now=True, null=True)
 
     def __unicode__(self):
-        return self.level
+        return self.first_name + '.' + self.last_name

homepage/models.py

@@ -3,7 +3,7 @@
 from django.shortcuts import render,render_to_response
 from django.core.paginator import Paginator,EmptyPage,PageNotAnInteger
 from django.http import HttpResponse
-from .models import TeacherInfo,GradeSubjectMenu,GradeInfo
+from .models import Teacher,GradeSubject
 
 
 
@@ -15,36 +15,30 @@ def welcome(request):
 def index(request):
     grade_level = request.GET.get('grade_level')
     subject_level = request.GET.get('subject_level')
-    age = '4'
-    tec_info_list_all = TeacherInfo.objects.filter(tec_age=age)
 
-    #tec_info_list_all = TeacherInfo.objects.all()
+    tec_info_list_all = []
+    for tec_info in Teacher.objects.all():
+        if not subject_level == tec_info.skill2.slug:
+            continue
+        for ti in tec_info.skill.all():
+            if grade_level == ti.slug:
+                tec_info_list_all.append(tec_info)
+                break
+
     paginator = Paginator(tec_info_list_all, 3)
     page = request.GET.get('page')
-    
-
     try:
         tec_info_list = paginator.page(page)
     except PageNotAnInteger:
         tec_info_list = paginator.page(1)
     except EmptyPage:
         tec_info_list = paginator.page(paginator.num_pages)
 
-    #grade_subject_dict = {}
-    #grade_dict = GradeSubjectMenu.objects.values('tab_grade').distinct()
-    #for grade in grade_dict:
-    #    key = grade['tab_grade']
-    #    grade_subject_dict[key] = GradeSubjectMenu.objects.filter(tab_grade=key)
-    
-    grade_subject_info = GradeInfo.objects.all()
-    #for grade in grade_subject_info:
-    #    for sub in grade.subject.all():
-    #        print sub.subject_name
-
-    #return render_to_response('index.html',{
-    #    'tec_info_list':tec_info_list,
-    #    'grade_subject_info':grade_subject_info})
-    return render_to_response('index.html',locals())
+    grade_subject_info = GradeSubject.objects.all()
+    return render_to_response('index.html',{
+       'tec_info_list':tec_info_list,
+       'grade_subject_info':grade_subject_info})
+    # return render_to_response('index.html',locals())
 
 
 def loadjsonfile():

homepage/views.py

@@ -1,4 +1,5 @@
 #!/bin/bash
 python manage.py makemigrations
 python manage.py migrate
+# python manage.py createsuperuser
 

sync.sh

@@ -4,14 +4,14 @@
 from django.template import RequestContext
 from django.views.decorators.csrf import csrf_exempt
 
-from homepage.models import TeacherInfo
+from homepage.models import Teacher
 from .models import User
 
 
 
 # Create your views here.
 def listing(request):
-    contact_list = TeacherInfo.objects.all()
+    contact_list = Teacher.objects.all()
     paginator = Paginator(contact_list, 2) # Show 25 contacts per page
 
     page = request.GET.get('page')