Merge pull request #4 from iapt-platform/laravel

用户字典改为Laravel api

app/Http/Controllers/SentPrController.php

@@ -90,6 +90,7 @@ class SentPrController extends Controller
 			book65 par：829-1306
 			book67 par：759-1152
 			*/
+
 			if(($data['book']==65 && $data['para']>=829 && $data['para']<=1306) || ($data['book']== 67 && $data['para'] >= 759 && $data['para'] <= 1152)){
 				$userinfo = new \UserInfo();
 
@@ -103,16 +104,27 @@ class SentPrController extends Controller
 				$prtext = mb_substr($data['text'],0,20,"UTF-8");
 				$link = "https://www-hk.wikipali.org/app/article/index.php?view=para&book={$data['book']}&par={$data['para']}&begin={$data['begin']}&end={$data['end']}&channel={$data['channel']}&mode=edit";
 				Log::info("palitext:{$palitext} prtext = {$prtext} link={$link}");
-					
 				switch ($data['channel']) {
+					//测试
+					//case '3b0cb0aa-ea88-4ce5-b67d-00a3e76220cc':
+					//正式
 					case 'e5bc5c97-a6fb-4ccb-b7df-be6dcfee9c43':
-						$strMessage = "{$username} 就“{$palitext}”提出了这样的修改建议：“{$prtext}”，欢迎大家[点击链接]({$link})前往查看并讨论。";
+						$strMessage = "{$username} 就文句`{$palitext}`提出了修改建议：
+						>内容摘要：<font color=\"comment\">{$prtext}</font>，\n
+						>句子编号：<font color=\"info\">{$sent_num}</font>\n
+						欢迎大家[点击链接]({$link}&channel=e5bc5c97-a6fb-4ccb-b7df-be6dcfee9c43,8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					case '8622ad73-deef-4525-8e8e-ba3f1462724e':
-						$strMessage = "{$username} 就“{$palitext}”有这样的疑问：“{$prtext}”，欢迎大家[点击链接]({$link})前往查看并讨论。";
+						$strMessage = "{$username} 就文句`{$palitext}`有疑问：\n
+						>内容摘要：<font color=\"comment\">{$prtext}</font>，\n
+						>句子编号：<font color=\"info\">{$sent_num}</font>\n
+						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					case '5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8':
-						$strMessage = "{$username} 就“{$palitext}”中的问题做了这样的回复：“{$prtext}”，欢迎大家[点击链接]({$link})前往查看并讨论。";
+						$strMessage = "{$username} 就文句`{$palitext}`中的疑问有这样的回复：\n
+						>内容摘要：<font color=\"comment\">{$prtext}</font>，\n
+						>句子编号：<font color=\"info\">{$sent_num}</font>\n
+						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					default:
 						$strMessage = "";

public/app/calendar/index.html

@@ -639,11 +639,14 @@
 			solar_num = get_position(data_time).solar_station;
 			solar_num = Math.floor(solar_num);
 			lunar_num = get_position(data_time).lunar_station;
+			next_month = new Date()
+			next_month.setDate(data_time.getDate() + 30)
+			lunar_month_num = get_position(phaseRange(data_time, next_month, FULL)[0]).lunar_station
 			for (x_m in pali_month_name) {
-				if (lunar_num > pali_month_name[x_m].position && lunar_num < pali_month_name[Number(x_m) + 1].position) {
+				if (lunar_month_num > pali_month_name[x_m].position && lunar_month_num < pali_month_name[Number(x_m) + 1].position) {
 					result.month_name = pali_month_name[x_m]
 					break;
-				} else if (lunar_num < 1.25 || lunar_num >= 26) {
+				} else if (lunar_month_num < 1.25 || lunar_month_num >= 26) {
 					result.month_name = pali_month_name[0]
 					break;
 				}
@@ -653,6 +656,7 @@
 
 			result.solar = horoscope_name[solar_num]; //黄道十二宫星象名称
 			result.lunar = pali_nakkhatta_name[lunar_num]; //27星宿月站名称
+			result.nextfullmoon = phaseRange(data_time, next_month, FULL)[0]
 			return result;
 		}
 		function show_position() {
@@ -1032,13 +1036,13 @@
 	<title id="page_title"></title>
 	<div id="top" style="display: inline-flex;width: 100vw;">
 		<div class="left" style="display: inline-flex;height: 5vh;margin: auto 1em;">
-			<span style="line-height: 5vh;white-space: nowrap;">
+			<span style="white-space: nowrap;max-height: 5vh;white-space: nowrap;margin: auto 0;">
 				<script>
 					document.write(localString[g_language].timezone + "：");
 					$("#page_title").html(localString[g_language].BE);
 				</script>
 			</span>
-			<select id="time-zone-selector">
+			<select id="time-zone-selector" style="max-height: 5vh;height: fit-content;margin: auto 0;">
 				<option value="local" selected>
 					<script>
 						document.write(localString[g_language].local);
@@ -1121,6 +1125,26 @@
 			</div>
 
 
+		</div>
+		<div style="display: inline-block; width: 50%; justify-content: center;">
+			<script>
+				//document.write(localString[g_language].location);
+				document.write("单日查询：");
+				function set_date_info(date_time_element){
+					var date_info = new Object();
+					date_info = get_station_name(new Date(date_time_element.value))
+					let string="";
+					string += "在" + date_info.month_name.season_icon + date_info.month_name.season + "的" + date_info.month_name.value + "月";
+					string +=  "<br>月亮星宿：" + date_info.lunar.value + date_info.lunar.name_zh + "<br>";
+					string += "太阳星宿：" + date_info.solar.value + date_info.solar.name_zh;
+					string += "<br>月圆时间：" + date_info.nextfullmoon.toLocaleString()
+					$("#date_info_indetal").html(string)
+				}
+			</script>
+			<input type="datetime-local" id="input_date" onblur="set_date_info(this)" style="display: block;">
+			<span id="date_info_indetal" ></span>
+
+
 		</div>
 		<div class="right">
 			<span id="loading">

public/app/term/note.js

@@ -1416,6 +1416,11 @@ function myEndingTooltip(inStr){
             name:"နှင့်",
             tooltip:'具格/与',
         },
+        {
+            id:"my_inst2",
+            name:"နှင့်",
+            tooltip:'具格/与',
+        },
         {
             id:"my_inst3",
             name:"ကြောင့်",

public/app/term/popup_note.css

@@ -51,6 +51,9 @@ code ol {
 	z-index: 200;
 	/*font-family: "Noto Sans", "Noto Sans SC", "Noto Sans TC", Arial, Verdana;*/
 }
+.translation .popup_contence{
+	font-family: "Noto Sans", "Noto Sans SC", "Noto Sans TC", Arial, Verdana;
+}
 
 .popup_contence:after {
 	content: "\00a0";

public/app/term/term.css

@@ -730,7 +730,7 @@ pw {
 }
 .commentary .tool_bar > .right{
     /*left: 8em;*/
-    width: 8em;
+    width: fit-content;
 }
 .translation>.sent_tran_inner>.tool_bar > .right{
     right: 2em;

public/app/users_guide/zh-cn/grammar_my_abs.md

@@ -3,4 +3,6 @@
 
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
-|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|动名词(https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|过去分词(https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

public/app/users_guide/zh-cn/grammar_my_acc1.md

@@ -5,5 +5,9 @@
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**受动者**|把……|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-iov.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达主动语态的**双宾语**|使**A**变成B|[受动者·主 ➡ 动词<br>DIO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-dio.html#dio-p)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**主动**语态的**双宾语**|使A变成**B**|[受动者·次 ➡ 动词<br>DIO-S](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-dio.html#dio-s)|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|**A**被弄成B|[被动者·主 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|A被弄成**B**|[被动者·次 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|被……|[被动者 ➡ 被动动词<br>AOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-aov.html)|
 |[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|……的|[受动者 ➡ 动词<br>AOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-aov.html)|

public/app/users_guide/zh-cn/grammar_my_acc2.md

@@ -4,4 +4,5 @@
 
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
-|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**副词**|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
+|副词|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|

public/app/users_guide/zh-cn/grammar_my_inst1.md

@@ -4,3 +4,4 @@
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
 |[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**方式**|用……，以……，通过……|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**方式**|用……，以……，通过……|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|

public/app/users_guide/zh-cn/grammar_my_inst2.md

@@ -1,6 +1,7 @@
 # 缅文语尾
 ## 伴随关系
 sahādiyoga 或 sahatthayoga
+
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
 |[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**连带**关系（有连词）|跟……一起，与……一起|[伴随 ➡ 连词<br>SOE](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-soe.html)|

public/app/users_guide/zh-cn/grammar_my_time.md

@@ -1,3 +1,8 @@
 # 缅文语尾
 
-表示时间的整数
+表示持续一段时间
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|
+|副词|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|