5/24 update

+# Generated by Django 3.0.6 on 2020-05-20 09:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0003_auto_20200518_1332'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Maps',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('mapdata', models.TextField()),
+            ],
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-05-22 05:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0004_maps'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RT_agri_policy',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('city', models.CharField(max_length=7)),
+                ('cntr', models.CharField(max_length=7)),
+                ('plcy_name', models.CharField(max_length=50)),
+                ('plcy_condition', models.TextField()),
+                ('plcy_content', models.TextField()),
+                ('plcy_condition_detail', models.TextField()),
+                ('plcy_document', models.TextField()),
+                ('plcy_amount', models.TextField()),
+                ('plcy_contact', models.CharField(max_length=60)),
+            ],
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-05-22 06:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0005_rt_agri_policy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_amount',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_condition_detail',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_content',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_document',
+            field=models.TextField(blank=True),
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-05-22 06:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0006_auto_20200522_1510'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_contact',
+            field=models.CharField(blank=True, max_length=60),
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-05-22 06:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0007_auto_20200522_1510'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_amount',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_condition_detail',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_contact',
+            field=models.CharField(max_length=60, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_content',
+            field=models.TextField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_document',
+            field=models.TextField(null=True),
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-05-22 06:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market_analysis', '0008_auto_20200522_1513'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rt_agri_policy',
+            name='plcy_contact',
+            field=models.TextField(null=True),
+        ),
+    ]

@@ -11,3 +11,17 @@ class RT_edu(models.Model):
     edu_end = models.DateField()
     edu_time = models.IntegerField()
     edu_infocall = models.CharField(max_length=30)
+
+class Maps(models.Model):
+    mapdata = models.TextField()
+
+class RT_agri_policy(models.Model):
+    city = models.CharField(max_length=7)
+    cntr = models.CharField(max_length=7)
+    plcy_name = models.CharField(max_length=50)
+    plcy_condition = models.TextField()
+    plcy_content = models.TextField(null=True)
+    plcy_condition_detail = models.TextField(null=True)
+    plcy_document = models.TextField(null=True)
+    plcy_amount = models.TextField(null=True)
+    plcy_contact = models.TextField(null=True)
\ No newline at end of file

+<html>
+    <head>
+        <!-- link에 들어가 있는건 지도 데이터를 위한 css 파일 -->
+        <!-- script에 들어가 있는건 지도 데이터를 위한 js 파일 -->
+        <!-- 직접 다운받아 넣을 수도 있는데 우선은 그냥 웹에서 불러올 수 있도록 해놨다. -->
+        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
+        <script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
+        <!--css 내용 여기에 direct로 넣었다-->
+        <style>
+            #mapbase {position:relative; width:50%; height:0;padding-bottom:60%; }
+        </style>
+    </head>
+
+    <body>
+
+        {%for data in exportdata%}
+        <p>{{data.cntr}}</p>
+        {%endfor%}
+
+        <div id="mapbase"></div>
+
+        <script type="text/javascript">            
+            // map 객체 생성 map안에 넣어주는건 div id
+            // 위도, 경도, zoom 수준
+            var map = L.map('mapbase').setView([36.5205243,128.0540569], 7);
+            // tilelayer를 씌우는 작업 OSM을 사용했음
+            L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+                attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+                maxZoom: 10,
+                id: 'mapbox/light-v9',
+                tileSize: 512,
+                zoomOffset:-1,
+                accessToken: 'pk.eyJ1IjoidGpzZGszMTA1IiwiYSI6ImNrYWM5bXljZzB1N28ycnA5bTVsNHZsbnkifQ.W3-irWof5WMR8BcfBR4Ftw'
+            }).addTo(map);
+
+            // mapdata 가져오는 부분
+            var statesData = "{{maps}}".replace(/&quot;/g,"\"");
+            
+            statesData = JSON.parse(statesData);
+            
+            // replace 쓰는 방법 : (바꾸기 전 문자, 바꾸고 난 후 문자)
+            // density data 추가하는 부분
+            var densitydata = "{{exportdata}}".replace(/&#x27;/g,"\"");
+            densitydata = densitydata.slice(13,-4);
+            densitydata = JSON.parse(densitydata);
+            
+            document.write(densitydata);
+
+            for(var i =0; i<densitydata.length; i++)
+            {
+                for(var j=0; j<statesData.features.length; j++)
+                {
+                    if (statesData.features[j]['properties']['SIG_KOR_NM'].indexOf(densitydata[i]['cntr'])==0)
+                        {
+                            statesData.features[j]['properties']['density']=densitydata[i]['count'];
+                            break;
+                        }
+                }
+            };
+
+            function getColor(d) {
+                return d > 30 ? '#800026' :
+                    d > 25  ? '#BD0026' :
+                    d > 20  ? '#E31A1C' :
+                    d > 15  ? '#FC4E2A' :
+                    d > 10  ? '#FD8D3C' :
+                    d > 5   ? '#FEB24C' :
+                    d > 0   ? '#FED976' :
+                                '#FFEDA0';
+            }
+            function style(feature) {
+                return {
+                    fillColor: getColor(feature.properties.density),
+                    weight: 2,
+                    opacity: 1,
+                    color: 'white',
+                    dashArray: '3',
+                    fillOpacity: 0.7
+                };
+            }
+            L.geoJson(statesData, {style: style}).addTo(map);
+        </script>
+    </body>
+</html>
\ No newline at end of file

@@ -2,5 +2,5 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url('edulist', views.edulist),
+    url('maplist', views.maplist),
 ]
\ No newline at end of file

 from django.shortcuts import render
 from django.db.models import Count
-from .models import RT_edu
+from .models import RT_edu, Maps, RT_agri_policy
 
-# Create your views here.
+# Create your views here.           
 
-def edulist(request):
-    educations = RT_edu.objects.values('city').annotate(ct=Count('city'))
-    context = {'educations': educations}
-    return render(request, 'edulist.html', context)
+def dbselect(dbnameis):
+    if dbnameis=='agri':
+        policys = RT_agri_policy.objects.values('cntr').annotate(count=Count('cntr'))
+        return policys
+    elif dbnameis=='normal':
+        educations = RT_edu.objects.values(city='city').annotate(count=Count('city'))
+        return educations
+
+
+def maplist(request):
+    mapp = Maps.objects.get(id=10)
+    mapp = mapp.mapdata
+    exportdatas = dbselect('agri')
+    context = {'exportdata': exportdatas, 'maps':mapp}
+    return render(request, 'maplist.html', context)

+[LocalizedFileNames]
+전국+도매시장+경락가격(정산)+속성.xlsx=@전국+도매시장+경락가격(정산)+속성.xlsx,0

+http://data.fips.go.kr/openapi/service/ManageAcst0110Service/getAcst0110List?ServiceKey=3mibghQYDy9KNoH%2BWImJj0eZKQPaAvjq3GQ3ikImZtw4ds3uaWIPBhVJLzdmvnOZjdm100CbRBOOcCV6iPGxfw%3D%3D&numOfRows=10&pageNo=1&fromDt=20200510&toDt=20200510
\ No newline at end of file

+Sub 매크로2()
+'
+' 매크로2 매크로
+'
+' 바로 가기 키: Ctrl+Shift+Q
+'
+    Columns("R:R").Select
+    Selection.Insert Shift:=xlToRight, CopyOrigin:=xlFormatFromLeftOrAbove
+    Columns("S:S").Select
+    Selection.Insert Shift:=xlToRight, CopyOrigin:=xlFormatFromLeftOrAbove
+    Columns("T:T").Select
+    Selection.Insert Shift:=xlToRight, CopyOrigin:=xlFormatFromLeftOrAbove
+    Columns("Q:Q").Select
+    Selection.TextToColumns Destination:=Range("Q1"), DataType:=xlDelimited, _
+        TextQualifier:=xlDoubleQuote, ConsecutiveDelimiter:=True, Tab:=True, _
+        Semicolon:=False, Comma:=False, Space:=True, Other:=False, FieldInfo _
+        :=Array(Array(1, 1), Array(2, 1), Array(3, 1)), TrailingMinusNumbers:=True
+    Columns("T:T").Select
+    Selection.ClearContents
+    Range("Q1").Select
+    Selection.AutoFilter
+    ActiveSheet.Range("$A$1:$S$29462").AutoFilter Field:=17, Criteria1:=Array( _
+        "노르웨이", "뉴질랜드", "대만", "러시아", "말레이지아", "멕시코", "미국", "미얀마", "바레인", "베네주엘라", "베트남", "세네갈", _
+        "수입산", "아르헨티나", "에쿠아도르", "오만", "인도네시아", "인디아", "일본", "중국", "칠레", "카나다", "콜롬비아", "태국", _
+        "태평양산", "통가", "페루", "포클랜드", "필리핀", "한국", "호주", "="), Operator:=xlFilterValues
+    Columns("R:R").Select
+    Selection.ClearContents
+    ActiveSheet.Range("$A$1:$S$29462").AutoFilter Field:=17
+    Range("T2").Select
+    ActiveCell.FormulaR1C1 = _
+        "=IF(RC[-3]=RC[-2],RC[-1],IF(ISBLANK(RC[-2]),RC[-3],RC[-2]))"
+    Range("T2").Select
+    Selection.AutoFill Destination:=Range("T2:T29462")
+    Range("T2:T29462").Select
+    Range("T6").Select
+    Selection.End(xlDown).Select
+    Selection.End(xlUp).Select
+    Columns("T:T").Select
+    Selection.Copy
+    Range("Z1").Select
+    Selection.PasteSpecial Paste:=xlPasteValues, Operation:=xlNone, SkipBlanks _
+        :=False, Transpose:=False
+    Columns("R:T").Select
+    Range("T1").Activate
+    Application.CutCopyMode = False
+    Selection.ClearContents
+    Columns("S:T").Select
+    Selection.Delete Shift:=xlToLeft
+    Columns("X:X").Select
+    Selection.Cut
+    Range("R1").Select
+    ActiveSheet.Paste
+End Sub

+select city, count(*) as cnt from market_analysis_rt_edu group by city;
+
+select city, avg(edu_time) from market_analysis_rt_edu group by city;
+
+
+            L.tileLayer('https://api.maptiler.com/maps/positron/{z}/{x}/{y}.png?key=IHLiEj11tKzE3WCyeanP',{
+                id : 'mapbox/light-v9',
+                tilesize: 512,
+                attribution: '<a href="https://www.maptiler.com/copyright/" target="_blank">&copy; MapTiler</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap contributors</a>',
+                zoomOffset: -1
+            }).addTo(map)
\ No newline at end of file

+ Subproject commit 56e46ff5c9f564beb700215b260d33344b48db26