danamir/asutermflask
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

worked API

Browse Source
This commit is contained in:
danamir
2020-11-08 23:28:54 +03:00
parent a4acfadb65
commit a7285a4977
5 changed files with 87 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
api/actions.py
View File

@@ -4,15 +4,13 @@ import json
from bs4 import BeautifulSoup
def getGroups(returnJson = 0):
def getGroups(returnJson=0):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/task3,7_fastview.php"
response = requests.get(url = url, headers=headers)
response = requests.get(url=url, headers=headers)
response.encoding = 'utf-8'
soup = BeautifulSoup(response.content, 'lxml')
@@ -20,22 +18,20 @@ def getGroups(returnJson = 0):
groups = {}
for td in soup.findAll("ul"):
for a in td.findAll("li"):
groups[a.text.lower()] = a['value']
groups[a.text.lower()] = a['value']
if returnJson:
return json.dumps(groups, ensure_ascii=False)
return groups
return(groups)
def getGroupsList(returnJson = 0):
def getGroupsList(returnJson=0):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/task3,7_fastview.php"
response = requests.get(url = url, headers=headers)
response = requests.get(url=url, headers=headers)
response.encoding = 'utf-8'
soup = BeautifulSoup(response.content, 'lxml')
@@ -43,23 +39,21 @@ def getGroupsList(returnJson = 0):
groups = {}
for td in soup.findAll("ul"):
for a in td.findAll("li"):
groups[a.text.lower()] = a.text.lower()
groups[a.text.lower()] = a.text.lower()
if returnJson:
return json.dumps(groups, ensure_ascii=False)
return(groups)
return (groups)
def getDepart(returnJson = 0):
def getDepart(returnJson=0):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/task11_kafview.php"
response = requests.get(url = url, headers=headers)
response = requests.get(url=url, headers=headers)
response.encoding = 'utf-8'
soup = BeautifulSoup(response.content, 'lxml')
@@ -67,23 +61,22 @@ def getDepart(returnJson = 0):
departaments = {}
for td in soup.findAll('tr'):
for t in td.findAll('td'):
for a in t.findAll('option'):
departaments[a.text.lower()] = a['value']
for a in t.findAll('option'):
departaments[a.text.lower()] = a['value']
if returnJson:
return json.dumps(departaments, ensure_ascii=False)
return(departaments)
return (departaments)
def getTeach(returnJson = 0):
def getTeach(returnJson=0):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/task8_prepview.php"
response = requests.get(url = url, headers=headers)
response = requests.get(url=url, headers=headers)
response.encoding = 'utf-8'
soup = BeautifulSoup(response.content, 'lxml')
@@ -91,43 +84,37 @@ def getTeach(returnJson = 0):
teaches = {}
for td in soup.findAll('tr'):
for t in td.findAll('td'):
for a in t.findAll('option'):
teaches[a.text.lower()] = a['value']
for a in t.findAll('option'):
teaches[a.text.lower()] = a['value']
if returnJson:
return json.dumps(teaches, ensure_ascii=False)
return(teaches)
return (teaches)
def getFastPlan(gp_name, gp_id):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/tableFiller.php"
url = "https://tplan.madi.ru/tasks/tableFiller.php"
params = {
'tab': '7',
'gp_name': gp_name,
'gp_id': gp_id}
response = requests.post(url = url, data = params, headers=headers)
response = requests.post(url=url, data=params, headers=headers)
response.encoding = 'utf-8'
table_data = [[cell.text for cell in row()]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
def getExtPlan(gp_name, gp_id, sem_no, tp_year):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/tableFiller.php"
params = {
@@ -136,73 +123,71 @@ def getExtPlan(gp_name, gp_id, sem_no, tp_year):
'gp_id': gp_id,
'sem_no': sem_no,
'tp_year': tp_year}
response = requests.post(url = url, data = params, headers=headers)
response = requests.post(url=url, data=params, headers=headers)
response.encoding = 'utf-8'
table_data = [[cell.text for cell in row()]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
def getDeptPlan(dep_name, dep_id, sem_no, tp_year):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "http://tplan.madi.ru/tasks/tableFiller.php"
params = {
'tab': '11',
'kf_name': dep_name,
'kf_id': dep_id,
'sort': 1,
'sort': 1,
'sem_no': sem_no,
'tp_year': tp_year}
response = requests.post(url = url, data = params, headers=headers)
response = requests.post(url=url, data=params, headers=headers)
response.encoding = 'utf-8'
table_data = [[cell.text for cell in row()]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
def getTeachPlan(teach_name, teach_id, sem_no, tp_year):
def getTeachPlan(tp_year, sem_no, teach_id, teach_name):
headers = {'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
'User-Agent': 'Mozilla/5.0',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}
url = "https://tplan.madi.ru/tasks/tableFiller.php"
#tab=8&tp_year=20&sem_no=1&pr_id=2162&pr_name=%D0%90%D0%B1%D0%B1%D0%B0%D1%81%D0%BE%D0%B2+%D0%AD.%D0%9C.
url = "http://tplan.madi.ru/tasks/tableFiller.php"
params = {
'tab': '8',
'pr_name': teach_name,
'pr_id': teach_id,
'tp_year': tp_year,
'sem_no': sem_no,
'tp_year': tp_year}
response = requests.post(url = url, data = params, headers=headers)
'pr_id': teach_id,
'pr_name': teach_name
}
response = requests.post(url=url, data=params, headers=headers)
response.encoding = 'utf-8'
table_data = [[cell.text for cell in row()]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
for row in BeautifulSoup(response.text, 'lxml')("tr")]
dictOfWords = {i: table_data[i] for i in range(0, len(table_data))}
return (json.dumps(dict(dictOfWords), ensure_ascii=False))
dictOfWords = { i : table_data[i] for i in range(0, len(table_data) ) }
return(json.dumps(dict(dictOfWords), ensure_ascii=False))
def getGroupId(gp_name):
allGp = getGroups()
gp_id = allGp.get(gp_name)
print(gp_id)
return gp_id
if __name__ == '__main__':
getGroups()
pr = getTeachPlan(tp_year='20', sem_no='1', teach_id='1711', teach_name='tets' )
print(pr)

2
api/app.py
View File

@@ -73,7 +73,7 @@ def getTeacPlan():
sem_no = request.args.get('sem_no', None)
tp_year = request.args.get('tp_year', None)
teach_id = teach[teach_name.lower()]
return actions.getTeachPlan(teach_name, teach_id, sem_no, tp_year)
return actions.getTeachPlan(tp_year, sem_no, teach_id, teach_name)
@app.route('/api/v1.0/table/teach_plan', methods=['GET'])
def getTableTeacPlan():