Merge pull request #875 from visuddhinanda/chanpter_progress

后台任务开始执行时给dingding机器人发消息

app/Console/Commands/UpgradeDaily.php

@@ -40,6 +40,16 @@ class UpgradeDaily extends Command
     public function handle()
     {
         $start = time();
+        $url = "https://oapi.dingtalk.com/robot/send?access_token=34143dbec80a8fc09c1cb5897a5639ee3a9a32ecfe31835ad29bf7013bdb9fdf";
+        $param = [
+        "markdown"=> [
+            "title"=> "后台任务", 
+            "text"=> " wikipali: 每日统计后台任务开始执行。", 
+        ], 
+        "msgtype"=>"markdown"
+        ];
+        $response = Http::post($url, $param);
+
         # 刷巴利语句子uuid 仅调用一次
         //$this->call('upgrade:palitextid');
         //巴利原文段落库目录结构改变时运行
@@ -55,11 +65,10 @@ class UpgradeDaily extends Command
         $this->call('upgrade:wbwanalyses');
 
         $time = time()-$start;
-        $url = "https://oapi.dingtalk.com/robot/send?access_token=34143dbec80a8fc09c1cb5897a5639ee3a9a32ecfe31835ad29bf7013bdb9fdf";
         $param = [
         "markdown"=> [
             "title"=> "后台任务", 
-            "text"=> " wikipali: 后台任务成功执行。用时{$time}", 
+            "text"=> " wikipali: 每日统计后台任务执行完毕。用时{$time}", 
         ], 
         "msgtype"=>"markdown"
         ];

public/app/palicanon/index1.php

@@ -436,6 +436,8 @@ span.channel {
             }
             loadTagCategory(indexFilename);
             loadTagCategoryIndex();
+            loadFilterSetting();//载入上次的过滤器配置
+            LoadAllLanguage();
             <?php
             if(isset($_GET["view"])){
                 echo "_view = '{$_GET["view"]}';";

public/app/palicanon/palicanon.js

@@ -2,6 +2,7 @@ var _lang = "";
 var _langsetting = "";
 var _channelType = 'translation'
 var  _progress = 0.9;
+
 var _view = "community";
 var main_tag = "";
 var list_tag = new Array();
@@ -19,34 +20,38 @@ var _channelList;
 
 palicanon_load_term();
 
-function updateSetting(){
-    _langsetting = $("#setting_lang").val();
-    switch ($("#setting_lang").val()) {
+function getLangSetting(setting){
+    switch (setting) {
         case 'auto':
             switch (getCookie("language")) {
                 case 'zh-cn':
-                    _lang = 'zh';
+                    return 'zh';
                     break;
                 case 'zh-tw':
-                    _lang = 'zh';
+                    return 'zh';
                     break;    
                 case '':
-                    lang = '';
+                    return '';
                     break;
             }
             break;
         default:
-            _lang = $("#setting_lang").val();
+            return  setting;
             break;
     }
+}
+function updateSetting(){
+    _langsetting = $("#setting_lang").val();
+    _lang = getLangSetting(_langsetting);
     _channelType = $("#setting_channel_type").val();
     _progress = $("#setting_progress").val();
 
-    localStorage.setItem("pc_filter_setting",{
-        lang : $("#setting_lang").val(),
+    localStorage.setItem("pc_filter_setting",JSON.stringify({
+        lang : _lang,
+        lang_setting: $("#setting_lang").val(),
         channel_type : _channelType,
         progress:_progress,
-    })
+    }))
 
     LoadAllChannel();
 }
@@ -55,15 +60,14 @@ function updateSetting(){
 载入过滤器设置
 */
 function loadFilterSetting(){
-    if (localStorage.getItem ("pc_filter_setting") !== null) {
-        let setting = localStorage.getItem("pc_filter_setting");
-        _lang = setting.lang;
+    if (localStorage.getItem ("pc_filter_setting")) {
+        let setting = JSON.parse(localStorage.getItem("pc_filter_setting"));
+        _langsetting = setting.lang_setting;
+        _lang = getLangSetting(_langsetting);
         _channel_type = setting.channel_type;
         _progress = setting.progress;
     }
     _nextPageStart = 0;
-    communityGetChapter();
-    LoadAllChannel();
 }
 function community_onload() {
 	$("span[tag]").click(function () {
@@ -254,15 +258,15 @@ function communityGetChapter(offset=0){
             }
         });
 
-    communityLoadChapterTag(strTags,lang);
+    communityLoadChapterTag();
 }
 
 function communityLoadChapterTag(strTags="",lang=""){
     $.getJSON(
 		"/api/v2/progress?view=chapter-tag",
 		{
-			tags: strTags,
-			lang: lang,
+			tags: _tags,
+			lang: _lang,
             channel:_channel
 		},
 		function (data, status) {
@@ -1152,10 +1156,15 @@ function LoadAllLanguage(){
 		{},
 		function (data, status) {
             let html = "";
+            html += "<option value='auto'>自动</option>";
             html += "<option value=''>全部</option>";
             for (const iterator of data.data.rows) {
                 if(iterator.lang!=''){
-                    html += "<option value='"+iterator.lang+"'>";
+                    html += "<option value='"+iterator.lang+"' ";
+                    if(_langsetting==iterator.lang){
+                        html +=" selected ";
+                    }
+                    html +=">";
                     html += iterator.lang+"("+iterator.count+")";
                     html += "</option>"                          
                 }

public/app/widget/submenu.js

@@ -0,0 +1,31 @@
+function submenu_init(obj,param){
+    let html = "";
+    <div class="submenu" >
+		<p class="submenu_title" onclick="submenu_show_detail(this)">
+			样式
+            <svg class="icon" style="transform: rotate(0deg);">
+				<use xlink:href="../studio/svg/icon.svg#ic_add"></use>
+			</svg>
+		</p>
+		<div class="submenu_details hidden" style="max-height: 0px; padding: 0px; opacity: 0;">
+
+		</div>
+	</div>
+}
+
+function submenu_show_detail(obj) {
+	eParent = obj.parentNode;
+	var x = eParent.getElementsByTagName("div");
+	var o = obj.getElementsByTagName("svg");
+	if (x[0].style.maxHeight == "200em") {
+		x[0].style.maxHeight = "0px";
+		x[0].style.padding = "0px";
+		x[0].style.opacity = "0";
+		o[0].style.transform = "rotate(0deg)";
+	} else {
+		x[0].style.maxHeight = "200em";
+		x[0].style.padding = "10px";
+		x[0].style.opacity = "1";
+		o[0].style.transform = "rotate(45deg)";
+	}
+}