1. 隱藏信眾資料牌位標題

2. 刪除品項的料號欄位
3. 更新資料庫修改紀錄

web/App_Code/DataAccess/StyleDataAccess.cs

@@ -1,351 +0,0 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Wordprocessing;
-using MINOM.COM.Utility;
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Http.ModelBinding;
-
-/// <summary>
-/// StyleDataAccess 的摘要描述
-/// </summary>
-public class StyleDataAccess
-{
-    LogUtility log=new LogUtility();
-    object[] obj = new object[] { "Y", "" ,null};
-    public StyleDataAccess()
-    {
-        //
-        // TODO: 在這裡新增建構函式邏輯
-        //
-    }
-
-    public object[] AddTabletPaper(TabletPaperSize tps)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                var sp = new List<SqlParameter>();
-                sb.Append("insert into TabletPaperSize (PaperID,PaperName,Width,Height,CUser,CDate,CTime,UUser,UDate,UTime ) ");
-                sb.Append("values (@PaperID,@PaperName,@Width,@Height,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime )");
-                sp.Add(new SqlParameter("@PaperID",tps.PaperID));
-                sp.Add(new SqlParameter("@PaperName", tps.PaperName));
-                sp.Add(new SqlParameter("@Width", tps.Width));
-                sp.Add(new SqlParameter("@Height", tps.Height));
-                sp.Add(new SqlParameter("@CUser", tps.CUser));
-                sp.Add(new SqlParameter("@CDate", tps.CDate));
-                sp.Add(new SqlParameter("@CTime", tps.CTime));
-                sp.Add(new SqlParameter("@UUser", tps.UUser));
-                sp.Add(new SqlParameter("@UDate", tps.UDate));
-                sp.Add(new SqlParameter("@UTime", tps.UTime));
-                context.Database.ExecuteSqlCommand(sb.ToString(),sp.ToArray());
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("AddTabletPaper:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-        return obj;
-    }
-    public object[] GetTabletPaper(string paperID, string name)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                var sp = new List<SqlParameter>();
-
-                sb.Append("select * from TabletPaperSize where 1=1 ");
-                if (!string.IsNullOrEmpty(paperID))
-                {
-                    sb.Append("and PaperID=@PaperID ");
-                    sp.Add(new SqlParameter("@PaperID", paperID));
-                }
-                if (!string.IsNullOrEmpty(name))
-                {
-                    sb.Append("and Name=@Name ");
-                    sp.Add(new SqlParameter("@Name", name));
-                }
-                var data = context.Database.SqlQuery<TabletPaperSize>(sb.ToString(), sp.ToArray()).ToList();
-                obj[2] = data;
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("GetTabletElement:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-
-        return obj;
-    }
-
-
-    public object[] GetTabletElement(string elementID ,string name)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                var sp = new List<SqlParameter>();
-
-                sb.Append("select * from TabletElement where 1=1 ");
-                if (!string.IsNullOrEmpty(elementID))
-                {
-                    sb.Append("and ElementID=@ElementID ");
-                    sp.Add(new SqlParameter("@ElementID", elementID));
-                }
-                if (!string.IsNullOrEmpty(name))
-                {
-                    sb.Append("and Name=@Name ");
-                    sp.Add(new SqlParameter("@Name", name));
-                }
-                var data = context.Database.SqlQuery<TabletElement>(sb.ToString(), sp.ToArray()).ToList();
-                obj[2] = data;
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("GetTabletElement:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-
-        return obj;
-    }
-
-    public object[] GetStyleDetail(string styleID,string elementID)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                var sp = new List<SqlParameter>();
-
-                sb.Append("select * from TabletStyleDetail where 1=1 ");
-                if (!string.IsNullOrEmpty(styleID))
-                {
-                    sb.Append("and StyleID=@StyleID ");
-                    sp.Add(new SqlParameter("@StyleID", styleID));
-                }
-                if (!string.IsNullOrEmpty(elementID))
-                {
-                    sb.Append("and ElementID=@ElementID ");
-                    sp.Add(new SqlParameter("@ElementID", elementID));
-                }
-                var data = context.Database.SqlQuery<TabletStyleDetail>(sb.ToString(), sp.ToArray()).ToList();
-                obj[2] = data;
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("GetStyleDetail:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-
-        return obj;
-    }
-    public object[] GetStyle(string id,string name)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                var sp = new List<SqlParameter>();
-
-                sb.Append("select * from TabletStyle where 1=1 ");
-                if (!string.IsNullOrEmpty(id))
-                {
-                    sb.Append("and StyleID=@StyleID ");
-                    sp.Add(new SqlParameter( "@StyleID",id));
-                }
-                if (!string.IsNullOrEmpty(name))
-                {
-                    sb.Append("and Name=@Name ");
-                    sp.Add(new SqlParameter("@Name", name));
-                }
-               var data= context.Database.SqlQuery<TabletStyle>(sb.ToString(), sp.ToArray()).ToList();
-                obj[2]= data;
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("GetStyle:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-        return obj;
-    }
-
-    public object[] AddStyle(TabletStyle ts, List<TabletStyleDetail> list)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                SqlParameter[] sp = new SqlParameter[] {
-                new SqlParameter("@StyleID",ts.StyleID),
-                new SqlParameter("@Name",ts.Name),
-                new SqlParameter("@Descr",ts.Descr),
-                new SqlParameter("@PaperSize",ts.PaperSize),
-                new SqlParameter("@BackendImg",ts.BackendImg),
-                new SqlParameter("@PrintSize",ts.PrintSize),
-                new SqlParameter("@PrintMode",ts.PrintMode),
-                new SqlParameter("@Orientation",ts.Orientation),
-                new SqlParameter("@PrintPageCount",ts.PrintPageCount),
-                new SqlParameter("@RosterLimit",ts.RosterLimit),
-                new SqlParameter("@CUser",""),
-                new SqlParameter("@CDate",""),
-                new SqlParameter("@CTime",""),
-                new SqlParameter("@UUser",""),
-                new SqlParameter("@UDate",""),
-                new SqlParameter("@UTime",""),
-            };
-
-                sb.Append("insert into TabletStyle (StyleID,Name,Descr,PaperSize,BackendImg,PrintSize,PrintMode,Orientation,PrintPageCount,RosterLimit");
-                sb.Append(",CUser,CDate,CTime,UUser,UDate,UTime ) ");
-                sb.Append("values(@StyleID,@Name,@Descr,@PaperSize,@BackendImg,@PrintSize,@PrintMode,@Orientation,@PrintPageCount,@RosterLimit");
-                sb.Append(",@CUser,@CDate,@CTime,@UUser,@UDate,@UTime ) ");
-                context.Database.ExecuteSqlCommand(sb.ToString(), sp);
-
-                sb.Clear();
-                sb.Append("insert into TabletStyleDetail(StyleID,Name,Descr,ElementID,StartX,StartY,FontSize,BreakLen,FontFamily,TwoOffset,");
-                sb.Append("ThreeOffset,FourOffSet,IsActive,Width,Height,TextWidth,TextHeight,CUser,CDate,CTime,UUser,UDate,UTime) ");
-                sb.Append("values (@StyleID,@Name,@Descr,@ElementID,@StartX,@StartY,@FontSize,@BreakLen,@FontFamily,@TwoOffset,");
-                sb.Append("@ThreeOffset,@FourOffSet,@IsActive,@Width,@Height,@TextWidth,@TextHeight,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime) ");
-                foreach (var item in list)
-                {
-                    SqlParameter[] sp1 = new SqlParameter[] {
-                new SqlParameter("@StyleID",item.StyleID),
-                new SqlParameter("@Name",item.Name),
-                new SqlParameter("@Descr",item.Descr),
-                new SqlParameter("@ElementID",item.ElementID),
-                new SqlParameter("@StartX",item.StartX),
-                new SqlParameter("@StartY",item.StartY),
-                new SqlParameter("@FontSize",item.FontSize),
-                new SqlParameter("@BreakLen",item.BreakLen),
-                new SqlParameter("@FontFamily",item.FontFamily),
-                new SqlParameter("@TwoOffset",item.TwoOffset),
-                new SqlParameter("@ThreeOffset",item.ThreeOffset),
-                new SqlParameter("@FourOffset",item.FourOffset),
-                new SqlParameter("@IsActive",item.IsActive),
-                new SqlParameter("@Width",item.Width),
-                new SqlParameter("@Height",item.Height),
-                new SqlParameter("@TextWidth",item.TextWidth),
-                new SqlParameter("@TextHeight",item.TextHeight),
-                new SqlParameter("@CUser",""),
-                new SqlParameter("@CDate",""),
-                new SqlParameter("@CTime",""),
-                new SqlParameter("@UUser",""),
-                new SqlParameter("@UDate",""),
-                new SqlParameter("@UTime",""),
-            };
-                    context.Database.ExecuteSqlCommand(sb.ToString(), sp1.ToArray());
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("AddStyle:" + ex.Message+ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-        return obj;
-    }
-
-    public object[] UpdateStyle(TabletStyle ts, List<TabletStyleDetail> list)
-    {
-        try
-        {
-            using (var context = new ezEntities())
-            {
-                StringBuilder sb = new StringBuilder();
-                SqlParameter[] sp = new SqlParameter[] {
-                new SqlParameter("@StyleID",ts.StyleID),
-                new SqlParameter("@Name",ts.Name),
-                new SqlParameter("@Descr",ts.Descr),
-                new SqlParameter("@PaperSize",ts.PaperSize),
-                new SqlParameter("@BackendImg",ts.BackendImg),
-                new SqlParameter("@PrintSize",ts.PrintSize),
-                new SqlParameter("@PrintMode",ts.PrintMode),
-                new SqlParameter("@Orientation",ts.Orientation),
-                new SqlParameter("@PrintPageCount",ts.PrintPageCount),
-                new SqlParameter("@RosterLimit",ts.RosterLimit),
-                new SqlParameter("@CUser",""),
-                new SqlParameter("@CDate",""),
-                new SqlParameter("@CTime",""),
-                new SqlParameter("@UUser",""),
-                new SqlParameter("@UDate",""),
-                new SqlParameter("@UTime",""),
-            };
-
-                sb.Append("update TabletStyle set Descr=@Descr,PaperSize=@PaperSize,BackendImg=@BackendImg,PrintSize=@PrintSize,");
-                sb.Append("PrintMode=@PrintMode,Orientation=@Orientation,PrintPageCount=@PrintPageCount,RosterLimit=@RosterLimit,");
-                sb.Append("CUser=@CUser,CDate=@CDate,CTime=@CTime,UUser=@UUSer,UDate=@UDate,UTime=@UTime ");
-                sb.Append("where StyleID=@StyleID ");
-
-                context.Database.ExecuteSqlCommand(sb.ToString(), sp.ToArray());
-
-                sb.Clear();
-                sb.Append("update TabletStyleDetail set Descr=@Descr,StartX=@StartX,StartY=@StartY,FontSize=@FontSize,BreakLen=@BreakLen,");
-                sb.Append("FontFamily=@FontFamily,TwoOffset=@TwoOffset,ThreeOffset=@ThreeOffset,FourOffset=@FourOffset,IsActive=@IsActive,");
-                sb.Append("Width=@Width,Height=@Height,TextWidth=@TextWidth,TextHeight=@TextHeight,UUser=@UUser,UDate=@UDate,UTime=@UTime ");
-                sb.Append("where StyleID=@StyleID and ElementID=@ElementID ");
-                //sb.Append("insert into TabletStyleDetail(StyleID,Name,Descr,ElementID,StartX,StartY,FontSize,BreakLen,FontFamily,TwoOffset,");
-                //sb.Append("ThreeOffset,FourOffSet,IsActive,Width,Height,TextWidth,TextHeight,CUser,CDate,CTime,UUser,UDate,UTime) ");
-                //sb.Append("values (@StyleID,@Name,@Descr,@ElementID,@StartX,@StartY,@FontSize,@BreakLen,@FontFamily,@TwoOffset,");
-                //sb.Append("@ThreeOffset,@FourOffSet,@IsActive,@Width,@Height,@TextWidth,@TextHeight,@CUser,@CDate,@CTime,@UUser,@UDate,@UTime) ");
-                foreach (var item in list)
-                {
-                    SqlParameter[] sp1 = new SqlParameter[] {
-                new SqlParameter("@StyleID",item.StyleID),
-                new SqlParameter("@Name",item.Name),
-                new SqlParameter("@Descr",item.Descr),
-                new SqlParameter("@ElementID",item.ElementID),
-                new SqlParameter("@StartX",item.StartX),
-                new SqlParameter("@StartY",item.StartY),
-                new SqlParameter("@FontSize",item.FontSize),
-                new SqlParameter("@BreakLen",item.BreakLen),
-                new SqlParameter("@FontFamily",item.FontFamily),
-                new SqlParameter("@TwoOffset",item.TwoOffset),
-                new SqlParameter("@ThreeOffset",item.ThreeOffset),
-                new SqlParameter("@FourOffset",item.FourOffset),
-                new SqlParameter("@IsActive",item.IsActive),
-                new SqlParameter("@Width",item.Width),
-                new SqlParameter("@Height",item.Height),
-                new SqlParameter("@TextWidth",item.TextWidth),
-                new SqlParameter("@TextHeight",item.TextHeight),
-                new SqlParameter("@CUser",""),
-                new SqlParameter("@CDate",""),
-                new SqlParameter("@CTime",""),
-                new SqlParameter("@UUser",""),
-                new SqlParameter("@UDate",""),
-                new SqlParameter("@UTime",""),
-            };
-                    context.Database.ExecuteSqlCommand(sb.ToString(), sp1.ToArray());
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            log.writeErrorPath("UpdateStyle:" + ex.Message + ex.StackTrace);
-            obj[0] = "N";
-            obj[1] = ex.Message;
-        }
-        return obj;
-    }
-}

web/App_Code/Entity/Style.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-/// <summary>
-/// Style 的摘要描述
-/// </summary>
-public class TabletStyle
-{
-    public TabletStyle()
-    {
-        //
-        // TODO: 在這裡新增建構函式邏輯
-        //
-    }
-
-    public string StyleID { get; set; }
-    public string Name { get; set; }
-    public string Descr { get; set; }
-    public string PaperSize {  get; set; }
-    public string BackendImg    { get; set; }
-    public string PrintSize { get; set; }
-    public string PrintMode { get; set; }
-    public string Orientation { get; set; }
-    public string PrintPageCount { get; set; }
-    public string RosterLimit { get; set; }
-    public string CUser { get; set; }
-    public string CDate { get; set; }
-    public string CTime { get; set; }
-    public string UUser {  get; set; }
-    public string UDate { get; set; }
-    public string UTime { get; set; }
-}
-
-public class TabletStyleDetail
-{
-    public TabletStyleDetail() { }
-    public string StyleID { get; set; }
-    public string Name { get; set; }
-    public string Descr { get; set; }
-    public string ElementID { get; set; }
-    public string StartX { get; set; }
-    public string StartY { get; set; }
-    public string FontSize { get; set; }
-    public string FontFamily { get; set; }
-    public string TwoOffset { get; set; }
-    public string ThreeOffset { get; set; }
-    public string FourOffset { get; set; }
-    public string IsActive { get; set; }
-    public string Width { get; set; }
-    public string Height { get; set; }
-    public string TextWidth { get; set; }
-    public string TextHeight { get; set; }
-    public string BreakLen { get; set; }
-    public string CUser { get; set; }
-    public string CDate { get; set; }
-    public string CTime { get; set; }
-    public string UUser { get; set; }
-    public string UDate { get; set; }
-    public string UTime { get; set; }
-}
-
-public class TabletElement
-{
-    public TabletElement() { }
-    public string ElementID { get; set; }
-    public string Name { get; set; }
-    public string ElementType { get; set; }
-    public string SampleContent { get; set; }
-    public string CUser { get; set; }
-    public string CDate { get; set; }
-    public string CTime { get; set; }
-    public string UUser { get; set; }
-    public string UDate { get; set; }
-    public string UTime { get; set; }
-}
-
-public class TabletPaperSize
-{
-    public TabletPaperSize() { }
-    public string PaperID { get; set; }
-    public string PaperName { get; set; }
-    public string Width { get; set; }
-    public string Height { get; set; }
-    public string CUser { get; set; }
-    public string CDate { get; set; }
-    public string CTime { get; set; }
-    public string UUser { get; set; }
-    public string UDate { get; set; }
-    public string UTime { get; set; }
-}

web/App_Code/Model/Model.Context.cs

@@ -94,6 +94,7 @@ namespace Model
         public virtual DbSet<AncestralTabletRegistrant> AncestralTabletRegistrant { get; set; }
         public virtual DbSet<AncestralTabletStatus> AncestralTabletStatus { get; set; }
         public virtual DbSet<GuaDanOrderGuest> GuaDanOrderGuest { get; set; }
+        public virtual DbSet<auto_enroll> auto_enroll { get; set; }
     
         public virtual int pager_eztrust(Nullable<int> startRowIndex, Nullable<int> pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount)
         {

web/App_Code/Model/Model.Designer.cs

@@ -1,4 +1,4 @@
-// 已啟用模型 'C:\project\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
+// 已啟用模型 'E:\17168ERP\web\App_Code\Model\Model.edmx' 的 T4 程式碼產生。
 // 若要啟用舊版程式碼產生，請將 [程式碼產生策略] 設計工具屬性的值
 //變更為 [舊版 ObjectContext]。當模型在設計工具中開啟時，這個屬性便可
 //以在 [屬性] 視窗中使用。

web/App_Code/Model/Model.cs

@@ -184,6 +184,7 @@ namespace Model
         public string partno { get; set; }
         public string print_init { get; set; }
         public string is_reconcile { get; set; }
+        public Nullable<int> sort_order { get; set; }
     
         public virtual actItem_kind actItem_kind { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
@@ -405,6 +406,10 @@ namespace Model
         public Nullable<float> price { get; set; }
         public Nullable<int> qty { get; set; }
         public Nullable<System.DateTime> reg_time { get; set; }
+        public Nullable<bool> has_yang_limit { get; set; }
+        public Nullable<bool> has_chao_limit { get; set; }
+        public Nullable<int> yang_limit_count { get; set; }
+        public Nullable<int> chao_limit_count { get; set; }
     
         public virtual actItem actItem { get; set; }
         public virtual activity activity { get; set; }
@@ -676,6 +681,31 @@ namespace Model
     using System;
     using System.Collections.Generic;
     
+    public partial class auto_enroll
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public auto_enroll()
+        {
+            this.pro_order = new HashSet<pro_order>();
+        }
+    
+        public int num { get; set; }
+        public int f_num { get; set; }
+        public System.DateTime start_date { get; set; }
+        public System.DateTime end_date { get; set; }
+        public string receipt_title { get; set; }
+        public string receipt_address { get; set; }
+    
+        public virtual follower followers { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<pro_order> pro_order { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
     public partial class bed_kind
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
@@ -802,6 +832,7 @@ namespace Model
         public string smtp_def { get; set; }
         public string use_sender { get; set; }
         public string bed_order_no { get; set; }
+        public string last_auto_order_no { get; set; }
     }
 }
 namespace Model
@@ -903,6 +934,7 @@ namespace Model
             this.transfer_register1 = new HashSet<transfer_register>();
             this.GuaDanOrder = new HashSet<GuaDanOrder>();
             this.GuaDanOrderGuest = new HashSet<GuaDanOrderGuest>();
+            this.auto_enroll = new HashSet<auto_enroll>();
         }
     
         public int num { get; set; }
@@ -967,6 +999,8 @@ namespace Model
         public virtual ICollection<GuaDanOrder> GuaDanOrder { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<GuaDanOrderGuest> GuaDanOrderGuest { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<auto_enroll> auto_enroll { get; set; }
     }
 }
 namespace Model
@@ -1340,6 +1374,7 @@ namespace Model
         public Nullable<int> introducer { get; set; }
         public Nullable<bool> send_receipt { get; set; }
         public string receipt_title { get; set; }
+        public Nullable<int> au_num { get; set; }
     
         public virtual activity activity { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
@@ -1348,6 +1383,7 @@ namespace Model
         public virtual follower follower1 { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<pro_order_detail> pro_order_detail { get; set; }
+        public virtual auto_enroll auto_enroll { get; set; }
     }
 }
 namespace Model
@@ -1389,7 +1425,6 @@ namespace Model
         public Nullable<int> parent_num { get; set; }
         public string print_id { get; set; }
         public Nullable<System.DateTime> UpdateTime { get; set; }
-        public string style { get; set; }
     
         public virtual actItem actItem { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]

web/App_Code/Model/Model.edmx

@@ -91,6 +91,7 @@
           <Property Name="customize_data" Type="nvarchar(max)" />
           <Property Name="reg_time" Type="datetime" />
           <Property Name="is_reconcile" Type="nvarchar" MaxLength="1" />
+          <Property Name="sort_order" Type="int" />
         </EntityType>
         <EntityType Name="actItem_files">
           <Key>
@@ -189,6 +190,10 @@
           <Property Name="price" Type="real" />
           <Property Name="qty" Type="int" />
           <Property Name="reg_time" Type="datetime" />
+          <Property Name="has_yang_limit" Type="bit" />
+          <Property Name="has_chao_limit" Type="bit" />
+          <Property Name="yang_limit_count" Type="int" />
+          <Property Name="chao_limit_count" Type="int" />
         </EntityType>
         <EntityType Name="activity_spares">
           <Key>
@@ -329,6 +334,17 @@
           <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="title" Type="nvarchar" MaxLength="10" />
         </EntityType>
+        <EntityType Name="auto_enroll">
+          <Key>
+            <PropertyRef Name="num" />
+          </Key>
+          <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="f_num" Type="int" Nullable="false" />
+          <Property Name="start_date" Type="date" Nullable="false" />
+          <Property Name="end_date" Type="date" Nullable="false" />
+          <Property Name="receipt_title" Type="nvarchar(max)" />
+          <Property Name="receipt_address" Type="nchar" MaxLength="200" />
+        </EntityType>
         <EntityType Name="bed_kind">
           <Key>
             <PropertyRef Name="num" />
@@ -400,6 +416,7 @@
           <Property Name="smtp_def" Type="nvarchar" MaxLength="1" />
           <Property Name="use_sender" Type="nvarchar" MaxLength="1" />
           <Property Name="bed_order_no" Type="nvarchar" MaxLength="20" />
+          <Property Name="last_auto_order_no" Type="nvarchar" MaxLength="20" />
         </EntityType>
         <EntityType Name="country">
           <Key>
@@ -480,7 +497,7 @@
           <Property Name="country" Type="nvarchar" MaxLength="5" />
           <Property Name="appellation_id" Type="int" />
           <Property Name="follower_hash" Type="nvarchar" MaxLength="100" />
-          <Property Name="search_keywords" Type="nvarchar(max)" />
+          <Property Name="search_keywords" Type="varchar(max)" />
         </EntityType>
         <EntityType Name="followers_tablet">
           <Key>
@@ -604,8 +621,8 @@
           </Key>
           <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="kind" Type="nvarchar" MaxLength="100" />
-          <Property Name="starttime" Type="time" Precision="0" />
-          <Property Name="offtime" Type="time" Precision="0" />
+          <Property Name="starttime" Type="time" Precision="7" />
+          <Property Name="offtime" Type="time" Precision="7" />
           <Property Name="resttime" Type="int" />
           <Property Name="root" Type="int" />
           <Property Name="range" Type="int" />
@@ -696,6 +713,7 @@
           <Property Name="introducer" Type="int" />
           <Property Name="send_receipt" Type="bit" />
           <Property Name="receipt_title" Type="nvarchar(max)" />
+          <Property Name="au_num" Type="int" />
         </EntityType>
         <EntityType Name="pro_order_detail">
           <Key>
@@ -724,7 +742,6 @@
           <Property Name="customize_data" Type="nvarchar(max)" />
           <Property Name="printed_files" Type="nvarchar(max)" />
           <Property Name="UpdateTime" Type="datetime2" Precision="7" />
-		  <Property Name="style" Type="varchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="pro_order_record">
           <Key>
@@ -981,7 +998,7 @@
           <Property Name="balance_act_item" Type="int" />
           <Property Name="balance_pro_order_detail" Type="int" />
         </EntityType>
-        <Association Name="FK__Ancestral__Regis__4DF47A4E">
+        <Association Name="FK__Ancestral__Regis__1A9EF37A">
           <End Role="AncestralTabletRegistrant" Type="Self.AncestralTabletRegistrant" Multiplicity="1" />
           <End Role="AncestralTabletPositionRecord" Type="Self.AncestralTabletPositionRecord" Multiplicity="*" />
           <ReferentialConstraint>
@@ -1080,7 +1097,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_act_bom_actItem1">
-          <End Role="actItem" Type="Self.actItem" Multiplicity="0..1" />
+          <End Role="actItem" Type="Self.actItem" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="act_bom" Type="Self.act_bom" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="actItem">
@@ -1129,18 +1148,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_activity_activity_kind">
-          <End Role="activity_kind" Type="Self.activity_kind" Multiplicity="0..1" />
-          <End Role="activity" Type="Self.activity" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="activity_kind">
-              <PropertyRef Name="num" />
-            </Principal>
-            <Dependent Role="activity">
-              <PropertyRef Name="kind" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_activity_check_activity">
           <End Role="activity" Type="Self.activity" Multiplicity="0..1">
             <OnDelete Action="Cascade" />
@@ -1212,7 +1219,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_activity_relating_activity">
-          <End Role="activity" Type="Self.activity" Multiplicity="1" />
+          <End Role="activity" Type="Self.activity" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="activity_relating" Type="Self.activity_relating" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="activity">
@@ -1273,6 +1282,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_auto_enroll_followers">
+          <End Role="followers" Type="Self.followers" Multiplicity="1" />
+          <End Role="auto_enroll" Type="Self.auto_enroll" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="followers">
+              <PropertyRef Name="num" />
+            </Principal>
+            <Dependent Role="auto_enroll">
+              <PropertyRef Name="f_num" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_bed_kind_detail_bed_kind">
           <End Role="bed_kind" Type="Self.bed_kind" Multiplicity="0..1" />
           <End Role="bed_kind_detail" Type="Self.bed_kind_detail" Multiplicity="*" />
@@ -1638,7 +1659,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_activity">
-          <End Role="activity" Type="Self.activity" Multiplicity="0..1" />
+          <End Role="activity" Type="Self.activity" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order" Type="Self.pro_order" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="activity">
@@ -1649,6 +1672,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_pro_order_auto_enroll">
+          <End Role="auto_enroll" Type="Self.auto_enroll" Multiplicity="0..1" />
+          <End Role="pro_order" Type="Self.pro_order" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="auto_enroll">
+              <PropertyRef Name="num" />
+            </Principal>
+            <Dependent Role="pro_order">
+              <PropertyRef Name="au_num" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_pro_order_detail_actItem">
           <End Role="actItem" Type="Self.actItem" Multiplicity="0..1">
             <OnDelete Action="Cascade" />
@@ -1688,7 +1723,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_detail_pro_order">
-          <End Role="pro_order" Type="Self.pro_order" Multiplicity="1" />
+          <End Role="pro_order" Type="Self.pro_order" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order_detail" Type="Self.pro_order_detail" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="pro_order">
@@ -1700,7 +1737,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_pro_order_followers">
-          <End Role="followers" Type="Self.followers" Multiplicity="0..1" />
+          <End Role="followers" Type="Self.followers" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="pro_order" Type="Self.pro_order" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="followers">
@@ -2115,6 +2154,7 @@
           <EntitySet Name="AncestralTabletRegistrant" EntityType="Self.AncestralTabletRegistrant" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="AncestralTabletStatus" EntityType="Self.AncestralTabletStatus" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="appellation" EntityType="Self.appellation" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="auto_enroll" EntityType="Self.auto_enroll" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="bed_kind" EntityType="Self.bed_kind" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="bed_kind_detail" EntityType="Self.bed_kind_detail" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="bed_order" EntityType="Self.bed_order" Schema="dbo" store:Type="Tables" />
@@ -2158,7 +2198,7 @@
           <EntitySet Name="supplier" EntityType="Self.supplier" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="supplier_kind" EntityType="Self.supplier_kind" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="transfer_register" EntityType="Self.transfer_register" Schema="dbo" store:Type="Tables" />
-          <AssociationSet Name="FK__Ancestral__Regis__4DF47A4E" Association="Self.FK__Ancestral__Regis__4DF47A4E">
+          <AssociationSet Name="FK__Ancestral__Regis__1A9EF37A" Association="Self.FK__Ancestral__Regis__1A9EF37A">
             <End Role="AncestralTabletRegistrant" EntitySet="AncestralTabletRegistrant" />
             <End Role="AncestralTabletPositionRecord" EntitySet="AncestralTabletPositionRecord" />
           </AssociationSet>
@@ -2206,10 +2246,6 @@
             <End Role="activity_category_kind" EntitySet="activity_category_kind" />
             <End Role="activity" EntitySet="activity" />
           </AssociationSet>
-          <AssociationSet Name="FK_activity_activity_kind" Association="Self.FK_activity_activity_kind">
-            <End Role="activity_kind" EntitySet="activity_kind" />
-            <End Role="activity" EntitySet="activity" />
-          </AssociationSet>
           <AssociationSet Name="FK_activity_check_activity" Association="Self.FK_activity_check_activity">
             <End Role="activity" EntitySet="activity" />
             <End Role="activity_check" EntitySet="activity_check" />
@@ -2250,6 +2286,10 @@
             <End Role="AncestralTabletArea" EntitySet="AncestralTabletArea" />
             <End Role="AncestralTabletArea1" EntitySet="AncestralTabletArea" />
           </AssociationSet>
+          <AssociationSet Name="FK_auto_enroll_followers" Association="Self.FK_auto_enroll_followers">
+            <End Role="followers" EntitySet="followers" />
+            <End Role="auto_enroll" EntitySet="auto_enroll" />
+          </AssociationSet>
           <AssociationSet Name="FK_bed_kind_detail_bed_kind" Association="Self.FK_bed_kind_detail_bed_kind">
             <End Role="bed_kind" EntitySet="bed_kind" />
             <End Role="bed_kind_detail" EntitySet="bed_kind_detail" />
@@ -2374,6 +2414,10 @@
             <End Role="activity" EntitySet="activity" />
             <End Role="pro_order" EntitySet="pro_order" />
           </AssociationSet>
+          <AssociationSet Name="FK_pro_order_auto_enroll" Association="Self.FK_pro_order_auto_enroll">
+            <End Role="auto_enroll" EntitySet="auto_enroll" />
+            <End Role="pro_order" EntitySet="pro_order" />
+          </AssociationSet>
           <AssociationSet Name="FK_pro_order_detail_actItem" Association="Self.FK_pro_order_detail_actItem">
             <End Role="actItem" EntitySet="actItem" />
             <End Role="pro_order_detail" EntitySet="pro_order_detail" />
@@ -2614,6 +2658,7 @@
           <Property Name="print_init" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_actItem" FromRole="actItem" ToRole="transfer_register" />
           <Property Name="is_reconcile" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
+          <Property Name="sort_order" Type="Int32" />
           </EntityType>
         <EntityType Name="actItem_files">
           <Key>
@@ -2734,6 +2779,10 @@
           <Property Name="reg_time" Type="DateTime" Precision="3" />
           <NavigationProperty Name="actItem" Relationship="Self.FK_activity_relating_actItem" FromRole="activity_relating" ToRole="actItem" />
           <NavigationProperty Name="activity" Relationship="Self.FK_activity_relating_activity" FromRole="activity_relating" ToRole="activity" />
+          <Property Name="has_yang_limit" Type="Boolean" />
+          <Property Name="has_chao_limit" Type="Boolean" />
+          <Property Name="yang_limit_count" Type="Int32" />
+          <Property Name="chao_limit_count" Type="Int32" />
         </EntityType>
         <EntityType Name="activity_spares">
           <Key>
@@ -2897,6 +2946,7 @@
           <Property Name="smtp_def" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
           <Property Name="use_sender" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
           <Property Name="bed_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
+          <Property Name="last_auto_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="country">
           <Key>
@@ -2973,8 +3023,9 @@
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_followers" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="transfer_register1" Relationship="Model.FK_transfer_register_followers_match" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="GuaDanOrder" Relationship="Model.FK_GuaDanOrder_Followers" FromRole="follower" ToRole="GuaDanOrder" />
-          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="GuaDanOrderGuest" Relationship="Model.FK_GuaDanOrderGuest_FOLLOWERS" FromRole="follower" ToRole="GuaDanOrderGuest" />
+          <NavigationProperty Name="auto_enroll" Relationship="Model.FK_auto_enroll_followers" FromRole="follower" ToRole="auto_enroll" />
         </EntityType>
         <EntityType Name="followers_tablet">
           <Key>
@@ -3063,8 +3114,8 @@
           </Key>
           <Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="kind" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="starttime" Type="Time" Precision="0" />
-          <Property Name="offtime" Type="Time" Precision="0" />
+          <Property Name="starttime" Type="Time" Precision="7" />
+          <Property Name="offtime" Type="Time" Precision="7" />
           <Property Name="resttime" Type="Int32" />
           <Property Name="root" Type="Int32" />
           <Property Name="range" Type="Int32" />
@@ -3153,6 +3204,8 @@
           <NavigationProperty Name="pro_order_detail" Relationship="Self.FK_pro_order_detail_pro_order" FromRole="pro_order" ToRole="pro_order_detail" />
           <Property Name="send_receipt" Type="Boolean" />
           <Property Name="receipt_title" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="au_num" Type="Int32" />
+          <NavigationProperty Name="auto_enroll" Relationship="Model.FK_pro_order_auto_enroll" FromRole="pro_order" ToRole="auto_enroll" />
         </EntityType>
         <EntityType Name="pro_order_detail">
           <Key>
@@ -3189,7 +3242,6 @@
           <Property Name="UpdateTime" Type="DateTime" Precision="7" />
           <NavigationProperty Name="accountings" Relationship="Model.FK_accounting_pro_order_detail" FromRole="pro_order_detail" ToRole="accounting" />
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_pro_order_detail" FromRole="pro_order_detail" ToRole="transfer_register" />
-          <Property Name="style" Type="String" Unicode="true" FixedLength="false" MaxLength="50" Nullable="true" />
         </EntityType>
         <EntityType Name="pro_order_record">
           <Key>
@@ -4551,6 +4603,15 @@
             <End Role="GuaDanOrderGuest" EntitySet="GuaDanOrderGuest" />
             <End Role="RegionAndRoomAndBedSchedule" EntitySet="RegionAndRoomAndBedSchedule" />
           </AssociationSet>
+          <EntitySet Name="auto_enroll" EntityType="Model.auto_enroll" />
+          <AssociationSet Name="FK_auto_enroll_followers" Association="Model.FK_auto_enroll_followers">
+            <End Role="follower" EntitySet="followers" />
+            <End Role="auto_enroll" EntitySet="auto_enroll" />
+          </AssociationSet>
+          <AssociationSet Name="FK_pro_order_auto_enroll" Association="Model.FK_pro_order_auto_enroll">
+            <End Role="auto_enroll" EntitySet="auto_enroll" />
+            <End Role="pro_order" EntitySet="pro_order" />
+          </AssociationSet>
           </EntityContainer>
         <ComplexType Name="sp_helpdiagramdefinition_Result">
           <Property Type="Int32" Name="version" Nullable="true" />
@@ -5268,6 +5329,45 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <EntityType Name="auto_enroll">
+          <Key>
+            <PropertyRef Name="num" />
+          </Key>
+          <Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="f_num" Type="Int32" Nullable="false" />
+          <Property Name="start_date" Type="DateTime" Precision="0" Nullable="false" />
+          <Property Name="end_date" Type="DateTime" Precision="0" Nullable="false" />
+          <Property Name="receipt_title" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="receipt_address" Type="String" MaxLength="200" FixedLength="true" Unicode="true" />
+          <NavigationProperty Name="followers" Relationship="Model.FK_auto_enroll_followers" FromRole="auto_enroll" ToRole="follower" />
+          <NavigationProperty Name="pro_order" Relationship="Model.FK_pro_order_auto_enroll" FromRole="auto_enroll" ToRole="pro_order" />
+        </EntityType>
+        <Association Name="FK_auto_enroll_followers">
+          <End Type="Model.follower" Role="follower" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="Model.auto_enroll" Role="auto_enroll" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="follower">
+              <PropertyRef Name="num" />
+            </Principal>
+            <Dependent Role="auto_enroll">
+              <PropertyRef Name="f_num" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_pro_order_auto_enroll">
+          <End Type="Model.auto_enroll" Role="auto_enroll" Multiplicity="0..1" />
+          <End Type="Model.pro_order" Role="pro_order" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="auto_enroll">
+              <PropertyRef Name="num" />
+            </Principal>
+            <Dependent Role="pro_order">
+              <PropertyRef Name="au_num" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -5336,6 +5436,7 @@
           <EntitySetMapping Name="actItems">
             <EntityTypeMapping TypeName="Model.actItem">
               <MappingFragment StoreEntitySet="actItem">
+                <ScalarProperty Name="sort_order" ColumnName="sort_order" />
                 <ScalarProperty Name="is_reconcile" ColumnName="is_reconcile" />
                 <ScalarProperty Name="print_init" ColumnName="print_init" />
                 <ScalarProperty Name="partno" ColumnName="partno" />
@@ -5450,6 +5551,10 @@
           <EntitySetMapping Name="activity_relating">
             <EntityTypeMapping TypeName="Model.activity_relating">
               <MappingFragment StoreEntitySet="activity_relating">
+                <ScalarProperty Name="chao_limit_count" ColumnName="chao_limit_count" />
+                <ScalarProperty Name="yang_limit_count" ColumnName="yang_limit_count" />
+                <ScalarProperty Name="has_chao_limit" ColumnName="has_chao_limit" />
+                <ScalarProperty Name="has_yang_limit" ColumnName="has_yang_limit" />
                 <ScalarProperty Name="num" ColumnName="num" />
                 <ScalarProperty Name="activity_num" ColumnName="activity_num" />
                 <ScalarProperty Name="actItem_num" ColumnName="actItem_num" />
@@ -5589,6 +5694,7 @@
           <EntitySetMapping Name="companies">
             <EntityTypeMapping TypeName="Model.company">
               <MappingFragment StoreEntitySet="company">
+                <ScalarProperty Name="last_auto_order_no" ColumnName="last_auto_order_no" />
                 <ScalarProperty Name="num" ColumnName="num" />
                 <ScalarProperty Name="com_name" ColumnName="com_name" />
                 <ScalarProperty Name="com_mail" ColumnName="com_mail" />
@@ -5823,6 +5929,7 @@
           <EntitySetMapping Name="pro_order">
             <EntityTypeMapping TypeName="Model.pro_order">
               <MappingFragment StoreEntitySet="pro_order">
+                <ScalarProperty Name="au_num" ColumnName="au_num" />
                 <ScalarProperty Name="receipt_title" ColumnName="receipt_title" />
                 <ScalarProperty Name="send_receipt" ColumnName="send_receipt" />
                 <ScalarProperty Name="order_no" ColumnName="order_no" />
@@ -5865,7 +5972,6 @@
                 <ScalarProperty Name="demo" ColumnName="demo" />
                 <ScalarProperty Name="customize_data" ColumnName="customize_data" />
                 <ScalarProperty Name="printed_files" ColumnName="printed_files" />
-				  <ScalarProperty Name="style" ColumnName="style" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
@@ -6317,6 +6423,18 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="auto_enroll">
+            <EntityTypeMapping TypeName="Model.auto_enroll">
+              <MappingFragment StoreEntitySet="auto_enroll">
+                <ScalarProperty Name="receipt_address" ColumnName="receipt_address" />
+                <ScalarProperty Name="receipt_title" ColumnName="receipt_title" />
+                <ScalarProperty Name="end_date" ColumnName="end_date" />
+                <ScalarProperty Name="start_date" ColumnName="start_date" />
+                <ScalarProperty Name="f_num" ColumnName="f_num" />
+                <ScalarProperty Name="num" ColumnName="num" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

web/App_Code/Model/Model.edmx.diagram

@@ -4,12 +4,12 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="b267a343dc0c4bf0ae194b775754b108" Name="Diagram1" ZoomLevel="116">
+      <Diagram DiagramId="b267a343dc0c4bf0ae194b775754b108" Name="Diagram1" ZoomLevel="78">
         <EntityTypeShape EntityType="Model.accounting" Width="1.5" PointX="22.5" PointY="22.125" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_files" Width="1.5" PointX="15.75" PointY="27.75" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_kind" Width="1.5" PointX="11.25" PointY="27.625" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.accounting_kind2" Width="1.5" PointX="13.5" PointY="11.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="Model.actItem" Width="1.5" PointX="9.25" PointY="7.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="Model.actItem" Width="1.5" PointX="8.375" PointY="27.25" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.actItem_files" Width="1.5" PointX="16.5" PointY="5.875" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.actItem_kind" Width="1.5" PointX="6.125" PointY="7.875" IsExpanded="true" />
         <EntityTypeShape EntityType="Model.activity" Width="1.5" PointX="3" PointY="8.875" IsExpanded="true" />
@@ -162,6 +162,9 @@
         <AssociationConnector Association="Model.FK_GuaDanOrderGuest_RoomUuid" />
         <AssociationConnector Association="Model.FK_GuaDanOrderGuest_StatusCode" />
         <AssociationConnector Association="Model.FK_Schedule_GuaDanOrderGuest" />
+        <EntityTypeShape EntityType="Model.auto_enroll" Width="1.5" PointX="5.25" PointY="37.875" />
+        <AssociationConnector Association="Model.FK_auto_enroll_followers" />
+        <AssociationConnector Association="Model.FK_pro_order_auto_enroll" />
         </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

web/App_Code/admin.cs

@@ -28,7 +28,7 @@ namespace MyWeb
         public AdmItem info { get; set; }
 
         //定義欄位cookie==================start
-        public class AdmItem
+        public class  AdmItem
         {
             public int num { get; set; } 
             public string u_id { get; set; }

web/App_Code/api/FollowerController.cs

@@ -1,15 +1,20 @@
-using System;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using Model;
+using MyWeb;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using PagedList;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data.Entity;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using MyWeb;
-using System.Data.Entity;
+using System.Web.Razor.Tokenizer;
 
 // api/Follower
 //[ezAuthorize(Roles = "admin")]//群組:*
@@ -103,17 +108,18 @@ public class FollowerController : ApiController
             {               
                 foreach (var item in prod)
                 {
-                    foreach (var item2 in item.pro_order_detail1)
-                        item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
+                    //foreach (var item2 in item.pro_order_detail1)
+                    //    item2.from_id = null; //清空訂單明細的陽上報恩者from_id //f_num設定串聯刪除
 
-                    foreach (var item2 in item.pro_order)
-                        item2.introducer = null; 
+                    //foreach (var item2 in item.pro_order)
+                    //    item2.introducer = null; 
 
-                    item.leader = null;//清空leader
+                    //item.leader = null;//清空leader
+                    _db.followers.RemoveRange(prod);
 
                 }
 
-                _db.followers.RemoveRange(prod);
+                //_db.followers.RemoveRange(prod);
                 _db.SaveChanges();
 
                 Model.admin_log admin_log = new Model.admin_log();
@@ -150,8 +156,10 @@ public class FollowerController : ApiController
             qry = qry.Where(o => o.u_name.Contains(q.u_name.Trim()));
         if (q.birthday.HasValue)
             qry = qry.Where(o => o.birthday >= q.birthday.Value);
-        if (q.birthday2.HasValue) 
-            qry = qry.Where(o => o.birthday < Convert.ToDateTime(q.birthday2.Value).AddDays(1));
+        if (q.birthday2.HasValue) {
+            var tmpBirthday2 = Convert.ToDateTime(q.birthday2.Value).AddDays(1);
+            qry = qry.Where(o => o.birthday < tmpBirthday2);
+        }
         if (!string.IsNullOrEmpty(q.address))
             qry = qry.Where(o => o.address !=null &&  o.address.Contains(q.address.Trim()));
         //if (q.num.HasValue && q.num.Value>0)
@@ -173,7 +181,7 @@ public class FollowerController : ApiController
 
             }
         }
-        
+
         // 電話/證號搜尋 (使用 search_keywords HEX 編碼)
         if (!string.IsNullOrEmpty(q.phone_idcode) && GlobalVariables.UseSearchKeywords)
         {
@@ -528,6 +536,203 @@ public class FollowerController : ApiController
 
     }
 
+    [HttpGet]
+    [Route("api/follower/GetAutoEnrollList/{id}")]
+    public IHttpActionResult GetAutoEnrollList(int id)
+    {
+        var prod = _db.auto_enroll.Where(q => q.f_num == id).ToList();
+        var ret = new
+        {
+            list = prod.Select(x => new
+            {
+                num = x.num,
+                auto_enroll_start_date = x.start_date.ToString("yyyy-MM-dd"),
+                auto_enroll_end_date = x.end_date.ToString("yyyy-MM-dd"),
+                auto_enroll_receipt_title = x.receipt_title?? "",
+                auto_enroll_receipt_address = x.receipt_address?? "",
+            }),
+
+        };
+        return Ok(ret);
+    }
+
+    [HttpPost]
+    [Route("api/follower/SaveAutoEnrollList")]
+    public IHttpActionResult SaveAutoEnrollList([FromBody] Model.auto_enroll item)
+    {
+        Model.auto_enroll autoEnroll;
+        if (item.num == 0)
+        {
+            // ===== 新增 =====
+            autoEnroll = new Model.auto_enroll()
+            {
+                f_num = item.f_num,
+                start_date = item.start_date,
+                end_date = item.end_date,
+                receipt_title = string.IsNullOrEmpty(item.receipt_title) ? null : item.receipt_title.Trim(),
+                receipt_address = string.IsNullOrEmpty(item.receipt_address) ? null : item.receipt_address.Trim(),
+            }
+        ;
+            _db.auto_enroll.Add(autoEnroll);
+            _db.SaveChanges();
+            CreateOrdersForActivities(item.f_num, autoEnroll.num, item.start_date, item.end_date, item.receipt_title, item.receipt_address);
+        }
+        else
+        {
+            // ===== 更新 =====
+            autoEnroll = _db.auto_enroll.Where(q => q.num == item.num).FirstOrDefault();
+            if (autoEnroll == null) return NotFound();
+         
+            autoEnroll.start_date = item.start_date;
+            autoEnroll.end_date = item.end_date;
+            autoEnroll.receipt_title = item.receipt_title?.Trim() ?? null;
+            autoEnroll.receipt_address = item.receipt_address?.Trim() ?? null;
+            _db.SaveChanges();
+            CreateOrdersForActivities(item.f_num, autoEnroll.num, item.start_date, item.end_date, item.receipt_title, item.receipt_address);
+        }
+
+        try
+        {
+            var ret = new
+            {
+                num = autoEnroll.num,
+                start_date = autoEnroll.start_date.ToString("yyyy-MM-dd"),
+                end_date = autoEnroll.end_date.ToString("yyyy-MM-dd"),
+                receipt_title = autoEnroll.receipt_title,
+                receipt_address = autoEnroll.receipt_address,
+            };
+            return Ok(ret);
+        }
+        catch(Exception ex)
+        {
+            return InternalServerError(ex);
+        }
+    }
+
+    [HttpPost]
+    [Route("api/follower/GetAffectedOrders")]
+    public IHttpActionResult GetAffectedOrders([FromBody] Model.auto_enroll item, bool is_delete = false)
+    {
+        if (item == null) return BadRequest();
+        try
+        {
+            IQueryable<pro_order> query = _db.pro_order
+                .Where(o => o.f_num == item.f_num
+                         && o.order_no.StartsWith("AU")
+                         && o.au_num == item.num);
+
+            if (is_delete)
+            {
+                // 刪除：查期間內所有自動報名訂單
+                query = query.Where(o =>
+                    o.activity.startDate_solar >= item.start_date &&
+                    o.activity.startDate_solar <= item.end_date
+                );
+            }
+            else
+            {
+                // 修改：查不在新範圍內的訂單
+                query = query.Where(o =>
+                    o.activity.startDate_solar < item.start_date ||
+                    o.activity.startDate_solar > item.end_date
+                );
+            }
+
+            var rawOrders = query.Select(o => new
+            {
+                o.order_no,
+                o.activity.subject,
+                o.activity.startDate_solar
+            }).ToList();
+
+            var affectedOrders = rawOrders.Select(o => new
+            {
+                order_no = o.order_no,
+                activityname = o.subject,
+                activitydate = o.startDate_solar?.ToString("yyyy/MM/dd") ?? ""
+            }).ToList();
+
+            return Ok(new
+            {
+                count = affectedOrders.Count,
+                list = affectedOrders
+            });
+        }
+        catch (Exception ex)
+        {
+            return InternalServerError(ex.GetBaseException());
+        }
+    }
+
+
+    [HttpDelete]
+    [Route("api/follower/DeleteAutoEnroll/{id}")]
+    public IHttpActionResult DeleteAutoEnroll(int id)
+    {
+        try
+        {
+            var prod = _db.auto_enroll.Where(q => q.num == id).FirstOrDefault();
+            if (prod != null)
+            {
+                _db.auto_enroll.Remove(prod);
+                _db.SaveChanges();
+                return Ok();
+            }
+            else return NotFound();
+        }
+        catch (Exception ex)
+        {
+            return BadRequest(ex.Message);
+        }
+    }
+
+
+    [HttpGet]
+    [Route("api/follower/GetUnfilledActivityOrders/{id}")]
+    public IHttpActionResult GetUnfilledActivityOrders(int id, int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
+    {
+        try
+        {
+            var config = _db.auto_enroll.FirstOrDefault(x => x.num == id);
+            if (config == null) return NotFound();
+
+            var query = from o in _db.pro_order
+                        join a in _db.activities on o.activity_num equals a.num
+                        where o.f_num == config.f_num
+                           && a.startDate_solar >= config.start_date
+                           && a.startDate_solar <= config.end_date
+                           && !_db.pro_order_detail.Any(d => d.order_no == o.order_no)
+                        select new { o, a };
+
+            int totalCount = query.Count();
+
+            var pagedData = query
+                .OrderByDescending(x => x.o.order_no) 
+                .Skip((page - 1) * pageSize)
+                .Take(pageSize)
+                .ToList()
+                .Select(x => new {
+                    order_no = x.o.order_no,
+                    startdate = x.a.startDate_solar?.ToString("yyyy/MM/dd") ?? "",
+                    enddate = x.a.endDate_solar?.ToString("yyyy/MM/dd") ?? "",
+                    activityname = x.a.subject,
+                    category = x.a.activity_category_kind?.kind ?? ""
+                });
+
+            return Ok(new
+            {
+                list = pagedData,
+                count = totalCount,
+                page = page,
+                pageSize = pageSize
+            });
+        }
+        catch (Exception ex)
+        {
+            return BadRequest(ex.Message);
+        }
+    }
+
 
     [HttpPost]
     [Route("api/follower/GetTabletList")]
@@ -655,8 +860,10 @@ public class FollowerController : ApiController
             list = orderrecord.Select(x => new
             {
                 orderno = x.order_no,
-                startdate = x.reg_time,
-                endtime = x.up_time,
+                //startdate = x.reg_time,
+                //endtime = x.up_time,
+                startdate = x.activity.startDate_solar,
+                enddate = x.activity.endDate_solar,
                 pwcount = x.pro_order_detail.Where(a => a.actItem.act_bom.Where(b => b.item_num == a.actItem_num && b.package_num == null).Count() == 0).Count(),
                 amount = x.pro_order_detail.Select(o => (float?)o.price).Sum(),
                 activityname = x.activity.subject,
@@ -667,6 +874,31 @@ public class FollowerController : ApiController
         return Ok(data);
     }
     [HttpPost]
+    [Route("api/follower/pending_orders")]
+    public IHttpActionResult GetPendingOrders(int id, string targetDate)
+    {
+        
+        DateTime today = DateTime.Today;
+        if (!DateTime.TryParse(targetDate, out DateTime limitDate))
+        {
+            limitDate = new DateTime(2099, 12, 31);
+        }
+        var orderrecord = _db.pro_order
+            .Where(x => x.f_num == id && x.activity.startDate_solar >= today && x.activity.startDate_solar < limitDate)
+            .Include(x => x.activity)
+            .ToList();
+        var data = new
+        {
+            list = orderrecord.Select(x => new
+            {
+                orderno = x.order_no,
+                activitydate = x.activity.startDate_solar.Value.ToString("yyyy/MM/dd"),
+                activityname = x.activity.subject,
+            })
+        };
+        return Ok(data);
+    }
+    [HttpPost]
     [Route("api/follower/totalorderamount")]
     public IHttpActionResult GetTotalOrderCount(int id)
     {
@@ -702,5 +934,132 @@ public class FollowerController : ApiController
         };
         return Ok(data);
     }
+
+    private void CreateOrdersForActivities(int f_num, int au_num, DateTime start_date, DateTime end_date, string receipt_title, string receipt_address)
+    {
+        var follower = _db.followers.Where(x => x.num == f_num).FirstOrDefault();
+        var activities = _db.activities
+            .Where(x =>
+                x.startDate_solar >= start_date &&
+                x.startDate_solar <= end_date
+            )
+            .ToList();
+
+        foreach (var activity in activities)
+        {
+            var existOrder = _db.pro_order
+                .Where(o => o.activity_num == activity.num && o.f_num == f_num)
+                .FirstOrDefault();
+
+            if (existOrder != null) {
+                existOrder.au_num = au_num;
+                _db.SaveChanges();
+                continue; 
+            }
+
+            string newOrderNo = AutoOrderService.CreateAutoOrderNumber(_db);
+            string finalPhone = follower?.cellphone ?? follower?.phone ?? "";
+
+            var newOrder = new pro_order
+            {
+                order_no = newOrderNo,
+                up_time = DateTime.Now,
+                reg_time = DateTime.Now,
+                keyin1 = "A01",
+                f_num = f_num,
+                au_num = au_num,
+                phone = finalPhone,
+                address = string.IsNullOrEmpty(receipt_address) ? "" : receipt_address,
+                activity_num = activity.num,
+                receipt_title = receipt_title ?? "",
+                demo = "",
+                customize_data = "",
+            };
+            _db.pro_order.Add(newOrder);
+
+            // 抓取同活動分類的上一筆訂單，複製品項
+            var latestOrder = _db.pro_order
+                .Where(o =>
+                    o.f_num == f_num &&
+                    o.activity.kind == activity.kind &&
+                    o.order_no != newOrderNo &&
+                    _db.pro_order_detail.Any(d => d.order_no == o.order_no)
+                )
+                .OrderByDescending(o => o.order_no)
+                .FirstOrDefault();
+
+            if (latestOrder != null)
+            {
+                var prevDetails = _db.pro_order_detail
+                    .Where(d => d.order_no == latestOrder.order_no)
+                    .ToList();
+
+                foreach (var detail in prevDetails)
+                {
+                    var newDetail = new pro_order_detail
+                    {
+                        order_no = newOrderNo,
+                        actItem_num = detail.actItem_num,
+                        parent_num = detail.parent_num,
+                        print_id = detail.print_id,
+                        f_num = detail.f_num,
+                        f_num_tablet = detail.f_num_tablet,
+                        address = detail.address,
+                        from_id = detail.from_id,
+                        from_id_tablet = detail.from_id_tablet,
+                        bed_type = detail.bed_type,
+                        qty = detail.qty,
+                        price = detail.price,
+                        start_date = DateTime.Today,
+                        pay = detail.pay,
+                        keyin1 = detail.keyin1,
+                        demo = detail.demo,
+                        customize_data = detail.customize_data,
+                        printed_files = detail.printed_files,
+                        UpdateTime = DateTime.Now,
+                    };
+                    _db.pro_order_detail.Add(newDetail);
+                }
+                
+            }
+        }
+
+        _db.SaveChanges();
+
+
+    }
+
 }
 
+public static class AutoOrderService
+{
+    private static readonly object _lock = new object();
+
+    public static string CreateAutoOrderNumber(Model.ezEntities _db)
+    {
+        lock (_lock)
+        {
+            string prefix = "AU" + DateTime.Now.ToString("yyMMdd");
+
+            var company = _db.companies.FirstOrDefault(q => q.num == 1);
+            if (company == null) return "";
+
+            string order_no;
+            if (!string.IsNullOrEmpty(company.last_auto_order_no) && company.last_auto_order_no.StartsWith(prefix))
+            {
+                string serialStr = company.last_auto_order_no.Replace(prefix, "");
+                int nextSerial = int.Parse(serialStr) + 1;
+                order_no = prefix + nextSerial.ToString("0000");
+            }
+            else
+            {
+                order_no = prefix + "0001";
+            }
+
+            company.last_auto_order_no = order_no;
+            _db.SaveChanges();
+
+            return order_no;
+        }
+    }
+}

web/App_Code/api/activityController.cs

@@ -1,14 +1,19 @@
-using System;
+using DocumentFormat.OpenXml.Drawing.Spreadsheet;
+using Model;
+using Newtonsoft.Json;
+using Org.BouncyCastle.Crypto;
+using PagedList;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data.Entity;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
+using System.Web.Services;
 using static TreeView;
-using System.Data.Entity;
 
 // api/activity
 //[ezAuthorize(Roles = "admin")]//群組:*
@@ -126,6 +131,12 @@ public class activityController : ApiController
         if (prod != null)
         {
             ////prod.IsDel = true; ////不確定是否新增欄位? 先註解
+
+            // 先刪除子項目
+            var prod2 = _db.act_bom.Where(q => q.package_num == prod.num).ToList();
+            _db.act_bom.RemoveRange(prod2);
+
+            _db.actItems.Remove(prod);
             _db.SaveChanges();
             Model.admin_log admin_log = new Model.admin_log();
             MyWeb.admin admin = new MyWeb.admin();//api裡不可以用MyWeb
@@ -190,12 +201,18 @@ public class activityController : ApiController
             if (prod.Count() > 0)
             {
                 //var prod2 = _db.actItem_files.AsEnumerable().Where(q => ids.Contains(Convert.ToInt32(q.actItem_num))).ToList();
-                var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList();
-                if (prod2.Count > 0)
-                {
-                    _db.actItem_files.RemoveRange(prod2);
-                    //_db.SaveChanges();
-                }
+                //var prod2 = _db.actItem_files.Where(q => ids.Contains(q.actItem_num)).ToList();
+                //if (prod2.Count > 0)
+                //{
+                //    _db.actItem_files.RemoveRange(prod2);
+                //    //_db.SaveChanges();
+                //}
+
+                // 先刪除子項目
+                var parentBoms = _db.act_bom.Where(q => q.item_num.HasValue && ids.Contains(q.item_num.Value)).ToList();
+                var parentIds = parentBoms.Select(x => x.num).ToList();     // 取得母件 id
+                var childBoms = _db.act_bom.Where(q => q.package_num.HasValue && parentIds.Contains(q.package_num.Value)).ToList();
+                _db.act_bom.RemoveRange(childBoms);
 
                 _db.actItems.RemoveRange(prod);
                 _db.SaveChanges();
@@ -282,7 +299,6 @@ public class activityController : ApiController
 
         var count = qry.Count(); //pageSize = count;//一次取回??
         var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
-        
         var ret = new
         {
             list = qryList.Select(x => new
@@ -302,18 +318,47 @@ public class activityController : ApiController
                 startDate_lunar = x.startDate_lunar,
                 endDate_lunar = x.endDate_lunar,
                 dueDate = x.dueDate,
-               orderCounts= _db.pro_order.Where(y => y.activity_num == x.num).Count(),
-    }),
-            count = count,
-            
 
-    };
+            }),
+            count = count
+
+        };
 
 
         if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
         return Ok(ret);
     }
 
+    public class SortOrderRequest
+    {
+        public List<int> ids { get; set; }
+    }
+
+    [HttpPost]
+    [Route("api/activity/SaveItemList")]
+    public IHttpActionResult UpdateSortOrder([FromBody] SortOrderRequest request)
+    {
+        if (request == null || request.ids == null) return BadRequest();
+
+        using (Model.ezEntities _db = new Model.ezEntities())
+        {
+            int totalCount = request.ids.Count;
+
+            for (int i = 0; i < totalCount; i++)
+            {
+                int id = request.ids[i];
+                var item = _db.actItems.FirstOrDefault(x => x.num == id);
+                if (item != null)
+                {
+                    // 改成總數減去索引，這樣第一筆 (i=0) 會拿到最大的數字
+                    item.sort_order = totalCount - i;
+                }
+            }
+            _db.SaveChanges();
+        }
+        return Ok();
+    }
+
     [HttpPost]
     [Route("api/activity/GetItemList")]
     public IHttpActionResult GetItemList([FromBody] Model.ViewModel.actItem q, int page, int pageSize = 10,
@@ -418,8 +463,14 @@ public class activityController : ApiController
             else
                 qry = qry.OrderBy(o => o.status);
         }
-        else
+        else if (sortBy.Equals("num"))
+        {
             qry = qry.OrderByDescending(o => o.num);
+        }
+        else
+        {
+            qry = qry.OrderByDescending(o => o.sort_order);
+        }
 
         var tdesc = publicFun.enum_desc<Model.activity.category>();
         var count = qry.Count(); //pageSize = count;//一次取回??
@@ -752,7 +803,7 @@ public class activityController : ApiController
 
             //已有值
             var count = qry.Count(); //pageSize = count;//一次取回??
-            var qryList = (pageSize > 0) ? qry.OrderBy(a=>a.num).ToPagedList(page, pageSize).ToList() : qry.ToList();
+            var qryList = (pageSize > 0) ? qry.OrderBy(a => a.num).ToPagedList(page, pageSize).ToList() : qry.ToList();
             var ret = new
             {
                 list = qryList.Select(x => new
@@ -908,6 +959,10 @@ public class activityController : ApiController
                             },
                             price = x.price ?? 0,
                             qty = x.qty ?? 0,
+                            has_yang_limit = x.has_yang_limit ?? false,
+                            has_chao_limit = x.has_yang_limit ?? false,
+                            yang_limit_count = x.yang_limit_count ?? 0,
+                            chao_limit_count = x.chao_limit_count ?? 0,
                             files = x.actItem?.actItem_files.Select(f => new
                             {
                                 num = f.file.num,
@@ -1125,6 +1180,10 @@ public class activityController : ApiController
                     if (item.qty.HasValue) { _data.qty = item.qty.Value; }
                     else { _data.qty = null; }
                     _data.reg_time = DateTime.Now;
+                    if (item.has_yang_limit.HasValue) { _data.has_yang_limit = item.has_yang_limit; }
+                    if (item.yang_limit_count >= 0) { _data.yang_limit_count = item.yang_limit_count.Value; }
+                    if (item.has_chao_limit.HasValue) { _data.has_chao_limit = item.has_chao_limit; }
+                    if (item.chao_limit_count >= 0) { _data.chao_limit_count = item.chao_limit_count.Value; }
 
                     _db.SaveChanges();
                     var ret = _data.num;
@@ -1145,6 +1204,10 @@ public class activityController : ApiController
                 if (item.qty.HasValue) { _data.qty = item.qty.Value; }
                 else { _data.qty = null; }
                 _data.reg_time = DateTime.Now;
+                if (item.has_yang_limit.HasValue) { _data.has_yang_limit = item.has_yang_limit; }
+                if (item.yang_limit_count >= 0) { _data.yang_limit_count = item.yang_limit_count.Value; }
+                if (item.has_chao_limit.HasValue) { _data.has_chao_limit = item.has_chao_limit; }
+                if (item.chao_limit_count >= 0) { _data.chao_limit_count = item.chao_limit_count.Value; }
 
                 _db.activity_relating.Add(_data);
                 _db.SaveChanges();
@@ -1303,7 +1366,7 @@ public class activityController : ApiController
     [Route("api/activity/OrderCheckIn")]
     public IHttpActionResult OrderCheckIn([FromBody] Model.activity_check item)
     {
-        if (item.f_num.HasValue && item.activity_num.HasValue && item.qty.HasValue && item.status.HasValue)
+        if (item.f_num.HasValue && item.activity_num.HasValue && item.status.HasValue)
         {
             //同一天不能簽到兩次以上            
             Model.activity_check check = _db.activity_check
@@ -1497,13 +1560,13 @@ public class activityController : ApiController
         var r1 = qry.ToList();
         var r2 = r1.Select(x => new { num = x.num, subject = x.subject });
         var count = qry.Count();
-        
+
         // 計算昨天和今天的日期範圍
         var yesterdayStart = _now.Date.AddDays(-1);
         var yesterdayEnd = _now.Date;
         var todayStart = _now.Date;
         var todayEnd = _now.Date.AddDays(1);
-        
+
         var ret = new
         {
             list = r1.Select(x => new
@@ -1557,4 +1620,136 @@ public class activityController : ApiController
         return Ok(ret);
     }
 
+    [HttpGet]
+    [Route("api/activity/GetUnfilledOrdersByActivity/{num}")]
+    public IHttpActionResult GetUnfilledOrdersByActivity(int num)
+    {
+        try
+        {
+            var activityExists = _db.activities.Any(a => a.num == num);
+            if (!activityExists) return NotFound();
+
+            var query = from o in _db.pro_order
+                        join f in _db.followers on o.f_num equals f.num into fg
+                        from f in fg.DefaultIfEmpty()
+                        where o.activity_num == num
+                           && !_db.pro_order_detail.Any(d => d.order_no == o.order_no)
+                        select new { o, f };
+
+            MyWeb.encrypt encrypt = new MyWeb.encrypt();
+
+            var unfilledOrders = query.ToList().Select(x => new
+            {
+                order_no = x.o.order_no,
+                f_number = x.f.f_number,
+                u_name = x.f != null ? x.f.u_name : "未知",
+                phone = !string.IsNullOrEmpty(x.f.cellphone) ? encrypt.DecryptAutoKey(x.f.cellphone) : (encrypt.DecryptAutoKey(x.f.phone) ?? ""),
+                order_date = x.o.reg_time.HasValue ? x.o.reg_time.Value.ToString("yyyy/MM/dd") : "",
+            }).ToList();
+
+            return Ok(new
+            {
+                list = unfilledOrders,
+                count = unfilledOrders.Count
+            });
+        }
+        catch (Exception ex)
+        {
+            return InternalServerError(ex.GetBaseException());
+        }
+    }
+
+    [HttpPost]
+    [Route("api/activity/TriggerAutoEnroll/{activity_num}")]
+    public IHttpActionResult TriggerAutoEnroll(int activity_num)
+    {
+        try
+        {
+            var activity = _db.activities.FirstOrDefault(a => a.num == activity_num);
+            if (activity == null) return NotFound();
+            if (!activity.startDate_solar.HasValue) return BadRequest("該活動沒有設定開始日期，無法執行自動報名。");
+
+            DateTime actDate = activity.startDate_solar.Value;
+
+            var validConfigs = _db.auto_enroll
+                .Where(ae => actDate >= ae.start_date && actDate <= ae.end_date)
+                .ToList();
+
+            int successCount = 0;
+
+            foreach (var config in validConfigs)
+            {
+                if (_db.pro_order.Any(o => o.activity_num == activity_num && o.f_num == config.f_num))
+                    continue;
+
+                var follower = _db.followers.FirstOrDefault(f => f.num == config.f_num);
+                string newOrderNo = AutoOrderService.CreateAutoOrderNumber(_db);
+
+                var newOrder = new pro_order
+                {
+                    order_no = newOrderNo,
+                    up_time = DateTime.Now,
+                    reg_time = DateTime.Now,
+                    keyin1 = "A01",
+                    f_num = config.f_num,
+                    au_num = config.num,
+                    phone = follower?.cellphone ?? follower?.phone ?? "",
+                    address = config.receipt_address ?? "",
+                    activity_num = activity_num,
+                    receipt_title = config.receipt_title ?? "",
+                    demo = "系統於新增活動時自動報名",
+                };
+                _db.pro_order.Add(newOrder);
+
+                CopyLatestOrderDetails(newOrderNo, config.f_num, (int)activity.kind);
+
+                successCount++;
+            }
+
+            _db.SaveChanges();
+
+            return Ok(new
+            {
+                message = $"自動報名執行完畢，共為 {successCount} 位信眾完成報名。",
+                count = successCount
+            });
+        }
+        catch (Exception ex)
+        {
+            return InternalServerError(ex.GetBaseException());
+        }
+    }
+    private void CopyLatestOrderDetails(string newOrderNo, int f_num, int activityKind)
+    {
+        var latestOrder = _db.pro_order
+            .Where(o => o.f_num == f_num && o.activity.kind == activityKind && _db.pro_order_detail.Any(d => d.order_no == o.order_no))
+            .OrderByDescending(o => o.order_no)
+            .FirstOrDefault();
+
+        if (latestOrder != null)
+        {
+            var prevDetails = _db.pro_order_detail.Where(d => d.order_no == latestOrder.order_no).ToList();
+            foreach (var detail in prevDetails)
+            {
+                _db.pro_order_detail.Add(new pro_order_detail
+                {
+                    order_no = newOrderNo,
+                    actItem_num = detail.actItem_num,
+                    parent_num = detail.parent_num,
+                    print_id = detail.print_id,
+                    f_num = detail.f_num,
+                    f_num_tablet = detail.f_num_tablet,
+                    address = detail.address,
+                    from_id = detail.from_id,
+                    from_id_tablet = detail.from_id_tablet,
+                    qty = detail.qty,
+                    price = detail.price,
+                    start_date = DateTime.Today,
+                    pay = 0,
+                    UpdateTime = DateTime.Now
+                });
+            }
+        }
+    }
+
 }

web/App_Code/api/designerController.cs

@@ -1,245 +0,0 @@
-using Microsoft.Ajax.Utilities;
-using MINOM.COM.Utility;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Web;
-using System.Web.Http;
-
-/// <summary>
-/// designerController 的摘要描述
-/// </summary>
-public class designerController : ApiController
-{
-    public designerController()
-    {
-        //
-        // TODO: 在這裡新增建構函式邏輯
-        //
-    }
-
-    [HttpPost]
-    [Route("api/tablet/GetTabletElement")]
-    public IHttpActionResult GetTabletElement([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-        var json = data;
-        string elementID = (json == null || json.elementID == null) ? "" : (string)json.elementID;
-        object[] obj = new StyleDataAccess().GetTabletElement(elementID, "");
-        if (obj[0].ToString() == "Y")
-        {
-            return Ok(new { result = "Y", data = obj[2] });
-        }
-        else
-        {
-            return Ok(new { result = "N", message = obj[1] });
-            //throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-        //return Ok(data);
-    }
-
-    [HttpPost]
-    [Route("api/tablet/GetStyleDetailData")]
-    public IHttpActionResult GetStyleDetailData([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-        var json = data;
-        string styleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
-        object[] obj = new StyleDataAccess().GetStyleDetail(styleID, "");
-        if (obj[0].ToString() == "Y")
-        {
-            return Ok(new { result = "Y", data = obj[2] });
-        }
-        else
-        {
-            return Ok(new { result = "N", message = obj[1] });
-            //throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-        //return Ok(data);
-    }
-
-    [HttpPost]
-    [Route("api/tablet/GetStyleData")]
-    public IHttpActionResult GetStyleData([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-
-        object[] obj = new StyleDataAccess().GetStyle("", "");
-        if (obj[0].ToString() == "Y")
-        {
-            return Ok(new { result = "Y", data = obj[2] });
-        }
-        else
-        {
-            return Ok(new { result = "N", message = obj[1] });
-            //throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-        //return Ok(data);
-    }
-
-    [HttpPost]
-    [Route("api/tablet/SavDegignerData")]
-    public IHttpActionResult SavDegignerData([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-        var json = data;
-        //json.detail.Children<JObject>()
-        log.writeLogPath((string)json.styleName);
-        TabletStyle ts = new TabletStyle();
-        List<TabletStyleDetail> list = new List<TabletStyleDetail>();
-        ts.StyleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
-        string mode = "edit";
-        if (string.IsNullOrEmpty(ts.StyleID))
-        {
-            ts.StyleID = DateTime.Now.ToString("yyyyMMddHHmmss");
-            mode = "add";
-        }
-        ts.Name = (json == null || json.styleName == null) ? "" : (string)json.styleName;
-        ts.Descr = (json == null || json.descr == null) ? "" : (string)json.descr;
-        ts.PaperSize = (json == null || json.paperSize == null) ? "" : (string)json.paperSize;
-        ts.BackendImg = (json == null || json.backendImg == null) ? "" : (string)json.backendImg;
-        ts.PrintSize = (json == null || json.printSize == null) ? "" : (string)json.printSize;
-        ts.Orientation = (json == null || json.orientation == null) ? "" : (string)json.orientation;
-        ts.PrintPageCount = (json == null || json.printPageCount == null) ? "" : (string)json.printPageCount;
-        ts.PrintMode = (json == null || json.printMode == null) ? "" : (string)json.printMode;
-        ts.RosterLimit=(json == null || json.rosterLimit == null) ? "" : (string)json.rosterLimit;
-        foreach (var item in json.detail.Children<JObject>())
-        {
-            TabletStyleDetail tsd = new TabletStyleDetail();
-            tsd.StyleID = ts.StyleID;
-            tsd.Name = item.name == null ? "" : (string)item.name;
-            tsd.Descr = item.descr == null ? "" : (string)item.descr;
-            tsd.ElementID = item.elementID == null ? "" : (string)item.elementID;
-            tsd.StartX = item.startX == null ? "" : (string)item.startX;
-            tsd.StartY = item.startY == null ? "" : (string)item.startY;
-            tsd.FontSize = item.fontSize == null ? "" : (string)item.fontSize;
-            tsd.FontFamily = item.fontFamily == null ? "" : (string)item.fontFamily;
-            tsd.BreakLen = item.breakLen == null ? "" : (string)item.breakLen;
-            tsd.Width = item.width == null ? "" : (string)item.width;
-            tsd.Height = item.height == null ? "" : (string)item.height;
-            tsd.TextWidth = item.textWidth == null ? "" : (string)item.textWidth;
-            tsd.TextHeight = item.textHeight == null ? "" : (string)item.textHeight;
-            tsd.TwoOffset = item.twoOffset == null ? "" : (string)item.twoOffset;
-            tsd.ThreeOffset = item.threeOffset == null ? "" : (string)item.threeOffset;
-            tsd.FourOffset = item.fourOffset == null ? "" : (string)item.fourOffset;
-            tsd.IsActive = item.isActive == null ? "" : (string)item.isActive;
-            list.Add(tsd);
-        }
-        if (mode == "add")
-        {
-            object[] obj = new StyleDataAccess().AddStyle(ts, list);
-        }
-        return Ok();
-    }
-
-
-
-    [HttpPost]
-    [Route("api/tablet/UpdateDegignerData")]
-    public IHttpActionResult UpdateDegignerData([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-        var json = data;
-        //json.detail.Children<JObject>()
-        log.writeLogPath((string)json.styleName);
-        TabletStyle ts = new TabletStyle();
-        List<TabletStyleDetail> list = new List<TabletStyleDetail>();
-        ts.StyleID = (json == null || json.styleID == null) ? "" : (string)json.styleID;
-        string mode = "edit";
-        if (string.IsNullOrEmpty(ts.StyleID))
-        {
-            ts.StyleID = DateTime.Now.ToString("yyyyMMddHHmmss");
-            mode = "add";
-        }
-        ts.Name = (json == null || json.styleName == null) ? "" : (string)json.styleName;
-        ts.Descr = (json == null || json.descr == null) ? "" : (string)json.descr;
-        ts.PaperSize = (json == null || json.paperSize == null) ? "" : (string)json.paperSize;
-        ts.BackendImg = (json == null || json.backendImg == null) ? "" : (string)json.backendImg;
-        ts.PrintSize = (json == null || json.printSize == null) ? "" : (string)json.printSize;
-        ts.Orientation = (json == null || json.orientation == null) ? "" : (string)json.orientation;
-        ts.PrintPageCount = (json == null || json.printPageCount == null) ? "" : (string)json.printPageCount;
-        ts.PrintMode = (json == null || json.printMode == null) ? "" : (string)json.printMode;
-        ts.RosterLimit = (json == null || json.rosterLimit == null) ? "" : (string)json.rosterLimit;
-        foreach (var item in json.detail.Children<JObject>())
-        {
-            TabletStyleDetail tsd = new TabletStyleDetail();
-            tsd.StyleID = ts.StyleID;
-            tsd.Name = item.name == null ? "" : (string)item.name;
-            tsd.Descr = item.descr == null ? "" : (string)item.descr;
-            tsd.ElementID = item.elementID == null ? "" : (string)item.elementID;
-            tsd.StartX = item.startX == null ? "" : (string)item.startX;
-            tsd.StartY = item.startY == null ? "" : (string)item.startY;
-            tsd.FontSize = item.fontSize == null ? "" : (string)item.fontSize;
-            tsd.FontFamily = item.fontFamily == null ? "" : (string)item.fontFamily;
-            tsd.BreakLen = item.breakLen == null ? "" : (string)item.breakLen;
-            tsd.Width = item.width == null ? "" : (string)item.width;
-            tsd.TwoOffset = item.twoOffset == null ? "" : (string)item.twoOffset;
-            tsd.ThreeOffset = item.threeOffset == null ? "" : (string)item.threeOffset;
-            tsd.FourOffset = item.fourOffset == null ? "" : (string)item.fourOffset;
-            tsd.IsActive = item.isActive == null ? "" : (string)item.isActive;
-            tsd.Width = item.width == null ? "" : (string)item.width;
-            tsd.Height = item.height == null ? "" : (string)item.height;
-            tsd.TextWidth = item.textWidth == null ? "" : (string)item.textWidth;
-            tsd.TextHeight = item.textHeight == null ? "" : (string)item.textHeight;
-            list.Add(tsd);
-        }
-
-        object[] obj = new StyleDataAccess().UpdateStyle(ts, list);
-
-        return Ok();
-    }
-
-
-    [HttpPost]
-    [Route("api/tablet/GetPaperSize")]
-    public IHttpActionResult GetPaperSize([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-
-        object[] obj = new StyleDataAccess().GetTabletPaper("", "");
-        if (obj[0].ToString() == "Y")
-        {
-            return Ok(new { result = "Y", data = obj[2] });
-        }
-        else
-        {
-            return Ok(new { result = "N", message = obj[1] });
-            //throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-        //return Ok(data);
-    }
-
-
-    [HttpPost]
-    [Route("api/tablet/SavePaperSize")]
-    public IHttpActionResult SavePaperSize([FromBody] dynamic data)
-    {
-        LogUtility log = new LogUtility();
-        var json = data;
-        //json.detail.Children<JObject>()
-        log.writeLogPath((string)json.styleName);
-        TabletPaperSize tps = new TabletPaperSize();
-        tps.PaperID = (json == null || json.paperID == null) ? "" : (string)json.paperID;
-        if (string.IsNullOrEmpty(tps.PaperID))
-        {
-            tps.PaperID = DateTime.Now.ToString("yyyyMMddHHmmss");
-        }
-        tps.PaperName = (json == null || json.paperName == null) ? "" : (string)json.paperName;
-        tps.Width = (json == null || json.width == null) ? "" : (string)json.width;
-        tps.Height = (json == null || json.height == null) ? "" : (string)json.height;
-        tps.CUser = "";
-        tps.CDate = DateTime.Now.ToString("yyyyMMdd");
-        tps.CTime = DateTime.Now.ToString("HHmmss");
-        tps.UUser = "";
-        tps.UDate = DateTime.Now.ToString("yyyyMMdd");
-        tps.UTime = DateTime.Now.ToString("HHmmss");
-
-        object[] obj = new StyleDataAccess().AddTabletPaper(tps);
-
-        return Ok();
-    }
-
-}

web/App_Code/api/orderController.cs

@@ -1,17 +1,21 @@
-using System;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using Model;
+using MyWeb;
+using Newtonsoft.Json;
+using PagedList;
+using System;
+using System.Activities.Expressions;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data.Entity;
+using System.Data.Entity.Core.Objects;
+using System.Diagnostics;
+using System.IdentityModel.Metadata;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using PagedList;
-using Newtonsoft.Json;
-using System.Collections;
 using static TreeView;
-using Model;
-using System.IdentityModel.Metadata;
-using MyWeb;
-using DocumentFormat.OpenXml.Drawing.Charts;
 
 
 // api/order
@@ -206,7 +210,7 @@ public class orderController : ApiController
      string sortBy = "", bool sortDesc = false)
     {
 
-        var qry = _db.pro_order.AsQueryable();
+        var qry = _db.pro_order.Include("activity").Include("activity.activity_check").AsQueryable();
         //var aIDt = _db.actItems.AsEnumerable().Where(f => f.subject.Contains(q.actItemTxt.Trim())).Select(f => f.num);//品項
 
 
@@ -221,7 +225,10 @@ public class orderController : ApiController
         if (q.up_time1.HasValue)
             qry = qry.Where(o => o.up_time >= q.up_time1.Value);
         if (q.up_time2.HasValue)
-            qry = qry.Where(o => o.up_time < Convert.ToDateTime(q.up_time2.Value).AddDays(1));
+        {
+            var tmp_up_time2 = Convert.ToDateTime(q.up_time2.Value).AddDays(1);
+            qry = qry.Where(o => o.up_time < tmp_up_time2);
+        }
         if (!string.IsNullOrEmpty(q.address))
             qry = qry.Where(o => o.address.Contains(q.address.Trim()));
         if (!string.IsNullOrEmpty(q.subject))
@@ -291,6 +298,13 @@ public class orderController : ApiController
             else
                 qry = qry.OrderBy(o => o.activity != null ? o.activity.subject : "");
         }
+        else if(sortBy.Equals("status"))
+        {
+            if (sortDesc)
+                qry = qry.OrderByDescending(o => o.activity.activity_check.FirstOrDefault(a => o.activity_num == a.activity_num && o.f_num == a.f_num).status ?? 0);
+            else
+                qry = qry.OrderBy(o => o.activity.activity_check.FirstOrDefault(a => o.activity_num == a.activity_num && o.f_num == a.f_num).status ?? 0);
+        }
         else
             qry = qry.OrderByDescending(o => o.reg_time);
 
@@ -307,6 +321,7 @@ public class orderController : ApiController
                 keyin1 = x.keyin1,
                 up_time = x.up_time,
                 keyin1_txt = Model.pro_order.keyin1_value_to_text(x.keyin1),
+                status = x.activity.activity_check.FirstOrDefault(a => x.activity_num == a.activity_num && x.f_num == a.f_num)?.status ?? 0,
             }),
             count = count
         };
@@ -338,7 +353,7 @@ public class orderController : ApiController
                     //var qry1 = _db.pro_order_detail.AsEnumerable();
                     //qry1 = qry1.Where(o => o.order_no == order_no);
                     //var qry1 = prod.pro_order_detail.AsEnumerable();
-                    var qry1 = prod.pro_order_detail.AsQueryable();
+                    var qry1 = prod.pro_order_detail.AsQueryable().Include(o => o.pro_order.activity.activity_relating);
 
                     //if (!string.IsNullOrEmpty(q.subject))
                     //    qry = qry.Where(o => o.subject.Contains(q.subject));
@@ -367,7 +382,7 @@ public class orderController : ApiController
                         qry1 = qry1.OrderByDescending(o => o.num);
 
                     }
-
+                   
                     var tdesc = publicFun.enum_desc<Model.pro_order.detailKeyin1>();
 
                     int i = 1;
@@ -377,83 +392,91 @@ public class orderController : ApiController
                             (List<pro_order_detail>)qry1_list.ToPagedList(page, pageSize);
                     var count = qry1_list.Count();
 
+                    
+
                     var ret = new
                     {
-                        list = qry1_list.Select(x => new
-                        {
-                            id = i++,
-                            num = x.num,
-                            order_no = x.order_no,
-                            actitem_num_selected = new
+                        list = qry1_list.Select(x => {
+                            var tmpActivityRelating = x.pro_order?.activity?.activity_relating?.Where(a => a.actItem_num == x.actItem_num).FirstOrDefault();
+                            return new
                             {
-                                text = x.actItem_num.HasValue ? x.actItem.subject : "",
-                                val = x.actItem_num.HasValue ? x.actItem_num.Value : 0,
-                            },
-                            parent_num = x.parent_num,
-                            f_num_selected = new
-                            {
-                                text = x.f_num.HasValue ? x.follower.u_name : "",
-                                val = x.f_num.HasValue ? x.f_num.Value : 0,
-                            },
-                            f_num_tablet = x.f_num_tablet,
-                            print_id = x.print_id,
-                            address = x.address,
-                            due_date = x.due_date,
-                            start_date = x.start_date,
-                            extend_date = x.extend_date,
-                            from_id_selected = new
-                            {
-                                text = x.from_id.HasValue ? x.follower1.u_name : "",
-                                val = x.from_id.HasValue ? x.from_id : 0,
-                            },
-                            from_id_tablet = x.from_id_tablet,
-                            price = x.price ?? 0,
-                            qty = x.qty ?? 0,
-                            writeBedQty = bedDt.Where(b => b.bed_order.o_detail_id.Value == x.num && b.checkIn_date.HasValue && b.bed_kind_detail_id.HasValue).Count(), //已劃數量
-                            notBedQty = bedDt.Where(b => b.bed_order.o_detail_id.Value == x.num && (!b.checkIn_date.HasValue || !b.bed_kind_detail_id.HasValue)).Count(), //未劃數量
-                            //total = x.total.HasValue ? x.total.Value : 0,
-                            category = x.actItem?.category,
-                            //pay = x.pay ?? 0,
-                            pay = x.pro_order_record.Select(c => c.price).Sum(),
-                            pay_date = x.pay_date,
-                            keyin1_selected = new
-                            {
-                                text = tdesc[x.keyin1.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1],
-                                val = x.keyin1,
-                            },
-                            demo = x.demo,
-                            files = x.actItem?.actItem_files.Select(f => new
-                            {
-                                num = f.file.num,
-                                subject = f.file.subject,
-                                word = f.file.word,
-                                cuz_column = f.file.customize_data ?? "", //??
-                                paperset = f.file.paperset ?? "",
-                            }),
-                            customize_data = x.customize_data ?? "",
-                            customize_data_comb = new
-                            {
-                                from_id_cuz_data = "",
-                                activity_cuz_data = "",
-                                actitem_cuz_data = "",
-                                order_cuz_data = "",
-                            },
-                            printed_files = x.printed_files ?? "",
-                            isPackage = (x.actItem.act_bom
-                                    .Any(ab => ab.package_num == null && ab.item_num != null)
-                                    ? 1 : 0),
-                            bom_order = (x.actItem.act_bom
-                                    .Any(ab => ab.package_num == null && ab.item_num != null)
-                                    ? x.num.ToString()
-                                    : (x.parent_num.ToString() + x.num.ToString())
-                                    ),
-                                    style=x.style??""
-                            //cash_record = x.pro_order_record.Select( c => new { 
-                            //    c,
-                            //    //pay_kind = tdesc2[c.payment.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1],
-                            //}),
+                                has_yang_limit = tmpActivityRelating?.has_yang_limit ?? false,
+                                has_chao_limit = tmpActivityRelating?.has_chao_limit ?? false,
+                                yang_limit_count = tmpActivityRelating?.yang_limit_count ?? 0,
+                                chao_limit_count = tmpActivityRelating?.chao_limit_count ?? 0,
+                                id = i++,
+                                num = x.num,
+                                order_no = x.order_no,
+                                actitem_num_selected = new
+                                {
+                                    text = x.actItem_num.HasValue ? x.actItem.subject : "",
+                                    val = x.actItem_num.HasValue ? x.actItem_num.Value : 0,
+                                },
+                                parent_num = x.parent_num,
+                                f_num_selected = new
+                                {
+                                    text = x.f_num.HasValue ? x.follower.u_name : "",
+                                    val = x.f_num.HasValue ? x.f_num.Value : 0,
+                                },
+                                f_num_tablet = x.f_num_tablet,
+                                print_id = x.print_id,
+                                address = x.address,
+                                due_date = x.due_date,
+                                start_date = x.start_date,
+                                extend_date = x.extend_date,
+                                from_id_selected = new
+                                {
+                                    text = x.from_id.HasValue ? x.follower1.u_name : "",
+                                    val = x.from_id.HasValue ? x.from_id : 0,
+                                },
+                                from_id_tablet = x.from_id_tablet,
+                                price = x.price ?? 0,
+                                qty = x.qty ?? 0,
+                                writeBedQty = bedDt.Where(b => b.bed_order.o_detail_id.Value == x.num && b.checkIn_date.HasValue && b.bed_kind_detail_id.HasValue).Count(), //已劃數量
+                                notBedQty = bedDt.Where(b => b.bed_order.o_detail_id.Value == x.num && (!b.checkIn_date.HasValue || !b.bed_kind_detail_id.HasValue)).Count(), //未劃數量
+                                //total = x.total.HasValue ? x.total.Value : 0,
+                                category = x.actItem?.category,
+                                //pay = x.pay ?? 0,
+                                pay = x.pro_order_record.Select(c => c.price).Sum(),
+                                pay_date = x.pay_date,
+                                keyin1_selected = new
+                                {
+                                    text = tdesc[x.keyin1.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1],
+                                    val = x.keyin1,
+                                },
+                                demo = x.demo,
+                                files = x.actItem?.actItem_files.Select(f => new
+                                {
+                                    num = f.file.num,
+                                    subject = f.file.subject,
+                                    word = f.file.word,
+                                    cuz_column = f.file.customize_data ?? "", //??
+                                    paperset = f.file.paperset ?? "",
+                                }),
+                                customize_data = x.customize_data ?? "",
+                                customize_data_comb = new
+                                {
+                                    from_id_cuz_data = "",
+                                    activity_cuz_data = "",
+                                    actitem_cuz_data = "",
+                                    order_cuz_data = "",
+                                },
+                                printed_files = x.printed_files ?? "",
+                                isPackage = (x.actItem.act_bom
+                                        .Any(ab => ab.package_num == null && ab.item_num != null)
+                                        ? 1 : 0),
+                                bom_order = (x.actItem.act_bom
+                                        .Any(ab => ab.package_num == null && ab.item_num != null)
+                                        ? x.num.ToString()
+                                        : (x.parent_num.ToString() + x.num.ToString())
+                                        ),
+                                //cash_record = x.pro_order_record.Select( c => new { 
+                                //    c,
+                                //    //pay_kind = tdesc2[c.payment.HasValue && x.keyin1.Value > 0 ? x.keyin1.Value : 1],
+                                //}),
 
-                        })
+                            };
+                           })
                             .ToList()
                             .OrderByDescending(x => (x.isPackage + (x.parent_num == null ? 0 : 1)))
                             //.ThenBy(x => (x.parent_num == null ? 1 : 2)) // Top-level items first
@@ -499,6 +522,10 @@ public class orderController : ApiController
                                     text = ar.actItem.subject,
                                     val = ar.actItem_num,
                                 },
+                                has_yang_limit = ar.has_yang_limit ?? false,
+                                has_chao_limit = ar.has_chao_limit ?? false,
+                                yang_limit_count = ar.yang_limit_count ?? 0,
+                                chao_limit_count = ar.chao_limit_count ?? 0,
                                 parent_num = q.num,
                                 f_num_selected = new
                                 {
@@ -579,6 +606,10 @@ public class orderController : ApiController
                                             text = x.actItem.subject,
                                             val = x.actItem.num,
                                         },
+                                        has_yang_limit = x.has_yang_limit,
+                                        has_chao_limit = x.has_chao_limit,
+                                        yang_limit_count = x.yang_limit_count,
+                                        chao_limit_count = x.chao_limit_count,
                                         f_num_selected = new
                                         {
                                             text = "",
@@ -684,7 +715,7 @@ public class orderController : ApiController
                     .Where(q => q.num == item.num)
                     .FirstOrDefault();//修改
                 if (order != null)
-                {                    
+                {
                     order.actItem_num = (item.actItem_num.HasValue && item.actItem_num.Value > 0) 
                         ? item.actItem_num : null;
                     order.f_num = (item.f_num.HasValue && item.f_num.Value > 0) 
@@ -713,7 +744,6 @@ public class orderController : ApiController
                     order.demo = item.demo;
                     order.customize_data = item.customize_data;
                     order.UpdateTime = DateTime.Now;
-                    order.style = item.style;
                     _db.SaveChanges();
                     var ret = new
                     {
@@ -767,7 +797,6 @@ public class orderController : ApiController
                     demo = item.demo,
                     customize_data = item.customize_data,
                     UpdateTime = DateTime.Now,
-                    style=item.style
                 };
                 _db.pro_order_detail.Add(orderDetail);
                 _db.SaveChanges();

web/App_Code/api/orderdetailController.cs

@@ -1,18 +1,14 @@
-using com.itextpdf.text.pdf;
-using Model;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PagedList;
-using System;
-using System.Collections;
+using System;
 using System.Collections.Generic;
-using System.Data.Entity;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using PagedList;
+using Newtonsoft.Json;
+using System.Collections;
 using static TreeView;
+using System.Data.Entity;
 
 /// <summary>
 /// orderdetail 的摘要说明
@@ -63,39 +59,4 @@ public class orderdetailController:ApiController
         if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
         return Ok(ret);
     }
-
-    [HttpPost]
-    [Route("api/orderdetail/GetDetailToPrint")]
-    public IHttpActionResult GetDetailToPrint([FromBody] dynamic data)
-    {
-        if (data.param is Newtonsoft.Json.Linq.JArray items)
-        {
-            string[] details = new string[items.Count];
-            int i = 0;
-            foreach (var item in items)
-            {
-                details[i] = item["order_no"] + item["num"].ToString();
-                i++;
-            }
-
-            var parameters = details.Select((s,j)=>"@p"+j).ToArray();
-            string sql = $"select *  from pro_order_detail where order_no+convert(varchar,num) in ({string.Join(",",parameters)}) ";
-   
-            int l =0;
-            List<SqlParameter> sqlList = new List<SqlParameter>();
-            foreach (var item in details)
-            {
-                sqlList.Add( new SqlParameter("@p" + l, item));
-                l++;
-            }
-            SqlParameter[] p = sqlList.ToArray();
-            var ret = _db.Database.SqlQuery<pro_order_detail>(sql, p).ToList();
-            if (ret == null) throw new HttpResponseException(HttpStatusCode.NotFound);
-            return Ok(ret);
-        }
-        else
-        {
-            throw new HttpResponseException(HttpStatusCode.NotFound);
-        }
-    }
 }

web/admin/Templates/TBS5ADM001/MasterPage.master

@@ -23,8 +23,6 @@
     <link href="~/js/sweetalert2/sweetalert2.min.css" rel="stylesheet" />        
 
     <link href="~/admin/Templates/TBS5ADM001/css/Style.css" rel="stylesheet" />
-    <link href="~/admin/item/css/floating.css" rel="stylesheet" />
-    <link href="~/admin/item/css/tablet-design.css" rel="stylesheet" />
     <asp:ContentPlaceHolder id="page_header" runat="server">
     </asp:ContentPlaceHolder>
 </head>
@@ -69,14 +67,14 @@
             let HTTP_HOST = "<%=UrlHost()%>";
         </script>
         <script src="<%=ResolveUrl("~/js/bootstrap5/js/bootstrap.bundle.min.js")%>"></script>
-        <script src="<%=ResolveUrl("~/js/jquery-4.0.0.min.js")%>"></script>
+        <script src="<%=ResolveUrl("~/js/jquery-3.6.0.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/vue.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/vuetify.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/axios.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/moment.min.js")%>"></script>
         <script src="<%=ResolveUrl("~/js/sweetalert2/sweetalert2.all.min.js") %>"></script>
         <script src="<%=ResolveUrl("~/admin/Templates/TBS5ADM001/js/Script.js")%>"></script>
-        <script src="<%=ResolveUrl("~/admin/item/jquery-ui/jquery-ui.min.js")%>"></script>
+        
         <script>
             //全局的VUE組件，操作提示組件
             Vue.component('message-modal', {

web/admin/Templates/TBS5ADM001/uc/menu.ascx

@@ -16,6 +16,8 @@
                         <asp:Repeater ID="Repeater2" runat="server" OnItemDataBound="Repeater2_ItemDataBound">
                         <ItemTemplate>
                             <a class="nav-link" href="<%#ResolveUrl(ValString(Eval("url"))) %>"
+                                onclick="sessionStorage.removeItem('member_list_cache'); sessionStorage.removeItem('member_query_params');
+                                            sessionStorage.removeItem('order_list_cache'); sessionStorage.removeItem('order_query_params');"
                                 target="<%#(ValString(Eval("target"))=="B"?"_blank":"_self") %>">
                                 <%#Eval("title") %></a>
                         </ItemTemplate>

web/admin/activity/index2.aspx

@@ -7,19 +7,20 @@
     <div class="mb-2 mb-sm-0">
         <ul class="nav ps-0">
             <li class="nav-item pe-3">
-                      <select class="form-select" v-model="search.kind" @change="btn_search">
+                      <select class="form-select" v-model="search.kind" @change="btn_search" :disabled="isEditing">
                                <option value="">選擇分類</option>
                                <option v-for="item in itemKindList" :value="item.num">{{item.kind}}</option>
                      </select>            
               </li>
               <li class="nav-item pe-1">
-                    <a href="item_reg.aspx" class="btn btn-primary">
+                    <a href="item_reg.aspx" class="btn btn-primary" :class="{ 'disabled': isEditing }" >
                         <i class="mdi mdi-plus"></i>新增
                     </a>
               </li>
-              <li class="nav-item pe-1">
-                    <a @click="deleteAll" class="btn btn-outline-danger" title="刪除勾選的資料" ><i class="mdi mdi-trash-can"></i> 刪除勾選</a>
-              </li>
+              
+            <li class="nav-item pe-1">
+                    <a @click="deleteAll" class="btn btn-outline-danger" title="刪除勾選的資料" :class="{ 'disabled': isEditing }" ><i class="mdi mdi-trash-can"></i> 刪除勾選</a>
+            </li>
         </ul>
     <%--  <div class="input-group mb-3" data-search-control="search1"  @click="search_show(search_dialog.controls.search1)">
                   <input class="form-control search-text" type="text" readonly
@@ -29,26 +30,31 @@
                       <i class="mdi mdi-view-list-outline"></i>
                   </button>
               </div>--%>
-    </div>    
+    </div> 
+    <div>
 
-    <div class="">
    
-        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click"><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
+    <a v-if="!isEditing" @click="editClick" class="btn btn-outline-secondary" title="編輯排列順序"><i class="mdi mdi-swap-vertical"></i> 編輯排列順序</a>
+    <a v-else @click="editClick" class="btn btn-outline-secondary" title="完成編輯排列順序"><i class="mdi mdi-swap-vertical"></i> 完成編輯</a>
+    <div :style="isEditing ? 'pointer-events: none; opacity: 0.5;' : ''" style="display:inline-block;">
+   
+        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click" ><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
 
-    </div>
+    </div> </div>
 </asp:Content>
 <asp:Content ID="Content5" ContentPlaceHolderID="footer_script" runat="Server">
- 
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.14.0/Sortable.min.js"></script>
     <script>
         Vue.filter('timeString', function (value, myFormat) {
             return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
         });
 
-        let VueApp=new Vue({
+        let VueApp = new Vue({
             el: '#app',
             vuetify: new Vuetify(vuetify_options),
             data() {
                 return {
+                    isEditing: false,
                     options: { multiSort: false },
                     data_table: {
                         loading: true,
@@ -63,20 +69,20 @@
                             { text: '項目分類', value: 'kindsTxt' },
                             { text: '類別', value: 'categoryTxt' },
                             { text: '預設金額', value: 'price' },
-                            { text: '庫存狀態', value: 'stock' },                         
+                            { text: '庫存狀態', value: 'stock' },
                             { text: '停用', value: 'status' },
                             { text: '', value: 'slot_btn', sortable: false, align: 'end' },
-                       						 
+
                         ],
-                        footer:{
+                        footer: {
                             showFirstLastPage: true,
-                            itemsPerPageOptions:[5,10,20,30],
+                            itemsPerPageOptions: [5, 10, 20, 30],
                         },
                     },
                     search: {
                         kind: '',
                         subject: '',
-                        selltime1:'',                        
+                        selltime1: '',
                         selltime2: '',
                         uptime1: '',
                         uptime2: '',
@@ -98,7 +104,7 @@
                                     { id: 'kind', title: '品項分類', value: '' },
                                 ],
                                 selected: {},
-                                select(t,data) {
+                                select(t, data) {
                                     data.search.kind = t.num;
                                     data.btn_search()
                                     console.log("select search1", t);
@@ -120,9 +126,9 @@
                     }, snackbar: {
                         show: false,
                         text: "",
-                    }, itemKindList:{
+                    }, itemKindList: {
                         num: 0,
-                        kind:''
+                        kind: ''
                     }
                 }
             },
@@ -149,9 +155,9 @@
                     if (!isNaN(actItemPage) && actItemPage !== 1) {
                         this.options.page = actItemPage;
                     }
-                }  
+                }
             },
-            methods: {               
+            methods: {
                 initKindList() {
                     axios
                         //.get(HTTP_HOST + 'api/activity_kind')
@@ -174,26 +180,45 @@
 
                 },
                 getDefault(clearpage = false) {
-                    const { sortBy, sortDesc, page, itemsPerPage } = this.options
-                    const params = {
-                        sortBy: sortBy[0], sortDesc: sortDesc[0],
-                        page: clearpage ? '1' :page, pageSize: itemsPerPage
-                    };
-                    this.data_table.loading = true
-                    axios
-                        .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
-                        .then(response => {
-                            this.data_table.list = response.data.list
-                            this.data_table.count = response.data.count;
-                            this.data_table.loading = false
-                        })
-                        .catch(error => console.log(error))
-                },           
-                editItem(item) {
-                    console.log("edit", item);              
+                    if (this.isEditing) {
+                        const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                        const params = {
+                            sortBy: "sort_order", sortDesc: sortDesc[0],
+                            page: clearpage ? '1' : page, pageSize: 0
+                        };
+                        this.data_table.loading = true
+                        axios
+                            .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
+                            .then(response => {
+                                this.data_table.list = response.data.list
+                                this.data_table.count = response.data.count;
+                                this.data_table.loading = false
+                            })
+                            .catch(error => console.log(error))
+                    }
+                    else {
+                        const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                        const params = {
+                            sortBy: sortBy[0], sortDesc: sortDesc[0],
+                            page: clearpage ? '1' : page, pageSize: itemsPerPage
+                        };
+                        this.data_table.loading = true
+                        axios
+                            .post(HTTP_HOST + 'api/activity/GetItemList', this.search, { params: params })
+                            .then(response => {
+                                this.data_table.list = response.data.list
+                                this.data_table.count = response.data.count;
+                                this.data_table.loading = false
+                            })
+                            .catch(error => console.log(error))
+                    }
+
                 },
-                deleteItem(item) {               
-                   
+                editItem(item) {
+                    console.log("edit", item);
+                },
+                deleteItem(item) {
+
                     if (confirm('是否確定刪除此筆資料?')) {
                         const index = this.data_table.list.indexOf(item)
                         if (index != -1) {
@@ -203,7 +228,7 @@
                                     this.getDefault();
                                 })
                                 .catch(error => console.log(error))
-                        }                      
+                        }
                     }
                 },
                 deleteAll() {
@@ -225,100 +250,155 @@
                             .catch(error => console.log(error))
                     }
                 },
-                btn_search() {      
+                editClick() {
+                    if (this.isEditing) {
+                        this.isEditing = false;
+                        const sortedIds = this.data_table.list.map(item => item.num);
+                        axios.post(HTTP_HOST + 'api/activity/SaveItemList', { ids: sortedIds })
+                            .then(response => {
+                                this.isEditing = false;
+                                this.getDefault();
+                            })
+                            .catch(error => {
+                                alert("儲存排序失敗：" + error);
+                            })
+                            .finally(() => {
+                                this.data_table.loading = false;
+                                
+                            });
+
+                    }
+                    else {
+                        this.isEditing = true;
+                        this.getDefault()
+                    }
+                },
+                btn_search() {
                     this.getDefault(true)
                 },
                 btn_all() {
                     clearObjProps(this.search);
                     this.btn_search()
-                },          
-              //===
-            search_show(curr) {
-                //console.log("btn_click:", curr, curr.api_url);
-                this.search_dialog.current = curr;
-                this.search_clear()
-                //this.search_get()//清除完自動會重抓, 故取消
-                this.search_dialog.show = true;
-            },
-            search_clear() {
-                if (!this.search_dialog.current.keys) return;
-                this.search_dialog.current.keys.forEach((t, i) => { t.value = '' })
-                this.search_get()
-            },
-            search_get() {
-                if (!this.search_dialog.current.keys) return;
-                let api_url = this.search_dialog.current.api_url;
-                let keys = this.search_dialog.current.keys;
-                //const { page, itemsPerPage } = this.options
-                //const { sortBy, sortDesc, page, itemsPerPage } = this.options
-                this.search_dialog.page = this.options.page ?? 1
-                let params = { page: this.search_dialog.page, pageSize: 10 };//url params
-                var search = {};//post body
-                keys.forEach((t, i) => {
-                    search[t.id] = t.value;
-                });
+                },
+                //===
+                search_show(curr) {
+                    //console.log("btn_click:", curr, curr.api_url);
+                    this.search_dialog.current = curr;
+                    this.search_clear()
+                    //this.search_get()//清除完自動會重抓, 故取消
+                    this.search_dialog.show = true;
+                },
+                search_clear() {
+                    if (!this.search_dialog.current.keys) return;
+                    this.search_dialog.current.keys.forEach((t, i) => { t.value = '' })
+                    this.search_get()
+                },
+                search_get() {
+                    if (!this.search_dialog.current.keys) return;
+                    let api_url = this.search_dialog.current.api_url;
+                    let keys = this.search_dialog.current.keys;
+                    //const { page, itemsPerPage } = this.options
+                    //const { sortBy, sortDesc, page, itemsPerPage } = this.options
+                    this.search_dialog.page = this.options.page ?? 1
+                    let params = { page: this.search_dialog.page, pageSize: 10 };//url params
+                    var search = {};//post body
+                    keys.forEach((t, i) => {
+                        search[t.id] = t.value;
+                    });
 
-                console.log("search_get", api_url, search, params, this.options);
-                this.search_dialog.loading = true
-                axios.post(api_url, search, { params: params })
-                    .then(response => {
-                        this.search_dialog.list = response.data.list
-                        this.search_dialog.count = response.data.count
-                        this.search_dialog.loading = false
+                    console.log("search_get", api_url, search, params, this.options);
+                    this.search_dialog.loading = true
+                    axios.post(api_url, search, { params: params })
+                        .then(response => {
+                            this.search_dialog.list = response.data.list
+                            this.search_dialog.count = response.data.count
+                            this.search_dialog.loading = false
+                        })
+                        .catch(error => {
+                            console.log(error)
+                            this.search_dialog.list = []
+                            this.search_dialog.count = 0
+                            this.search_dialog.loading = false
+                            this.snackbar.text = "錯誤:" + error
+                            this.snackbar.show = true
+                        })
+                },
+                search_headers() {
+                    if (!this.search_dialog.current.columns) return;
+                    r = [];
+                    this.search_dialog.current.columns.forEach((t, i) => {
+                        r.push({
+                            text: t.title,
+                            align: 'start',
+                            sortable: false,
+                            value: t.id,
+                        })
                     })
-                    .catch(error => {
-                        console.log(error)
-                        this.search_dialog.list = []
-                        this.search_dialog.count = 0
-                        this.search_dialog.loading = false
-                        this.snackbar.text = "錯誤:" + error
-                        this.snackbar.show = true
-                    })
-            },
-            search_headers() {
-                if (!this.search_dialog.current.columns) return;
-                r = [];
-                this.search_dialog.current.columns.forEach((t, i) => {
-                    r.push({
-                        text: t.title,
-                        align: 'start',
-                        sortable: false,
-                        value: t.id,
-                    })
-                })
-                return r
-            },
-            search_select(row) {
-                let curr = this.search_dialog.current;
-                let target = $(`[data-search-control=${curr.id}]`);
-                curr.selected = row;
-                target.children("input.search-text").val(curr.selected[curr.text_prop])//text
-                target.children("input:hidden").val(curr.selected[curr.value_prop])//value
-                if (curr.select instanceof Function) {
-                    curr.select(row,this);
-                }
-                this.search_dialog.show = false;
-            },
+                    return r
+                },
+                search_select(row) {
+                    let curr = this.search_dialog.current;
+                    let target = $(`[data-search-control=${curr.id}]`);
+                    curr.selected = row;
+                    target.children("input.search-text").val(curr.selected[curr.text_prop])//text
+                    target.children("input:hidden").val(curr.selected[curr.value_prop])//value
+                    if (curr.select instanceof Function) {
+                        curr.select(row, this);
+                    }
+                    this.search_dialog.show = false;
+                },
+                saveOrder(event) {
+                    const movedItem = this.data_table.list.splice(event.oldIndex, 1)[0];
+                    this.data_table.list.splice(event.newIndex, 0, movedItem);
+                },
 
             },
             computed: {
                 pageCount() {
                     return Math.ceil(this.data_table.count / this.data_table.pageSize)
                 },
+                computedHeaders() {
+                    return this.data_table.header.map(h => {
+                        if (h.value === 'slot_btn') {
+                            return { ...h, sortable: false };
+                        }
+
+                        return {
+                            ...h,
+                            sortable: this.isEditing ? false : (h.sortable !== false)
+                        };
+                    });
+                },
             },
             filters: {
                 currency: function (value) {
                     return value == null || value == "" ? "" :
                         ('$' + parseFloat(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,").replace(".00", ""));
                 },
-            }
+            },
+            directives: {
+                sortableDataTable: {
+                    bind(el, binding, vnode) {
+                        const options = {
+                            animation: 150,
+                            onUpdate: function (event) {
+                                vnode.child.$emit('sorted', event)
+                            }
+                        }
+                        Sortable.create(el.getElementsByTagName('tbody')[0], options)
+                    }
+                }
+            },
         })
     </script>   
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
     <uc1:alert runat="server" ID="L_msg" Text="" />
      <div id="content" class="container-fluid">
-        <v-data-table 
+        <v-data-table
+            v-sortable-data-table
+            @sorted="saveOrder"
+            :headers="computedHeaders"
             v-model="data_table.selected"
             :items="data_table.list"
             :search-props="search"
@@ -332,8 +412,29 @@
             show-select
             hide-default-footer
             :page.sync="data_table.page"
-            :items-per-page.sync="data_table.pageSize"
+            :items-per-page.sync= "isEditing ? -1 :data_table.pageSize"
             class="elevation-1">
+            <template v-slot:header.data-table-select="{ on, props }">
+                <v-simple-checkbox
+                    v-if="!isEditing"
+                    v-bind="props"
+                    v-on="on"
+                ></v-simple-checkbox>
+
+                <v-icon v-else small>mdi-swap-vertical</v-icon>
+            </template>
+              <template v-slot:item.data-table-select="{ item, isSelected, select }">
+                <v-simple-checkbox
+                    v-if="!isEditing"
+                    :value="isSelected"
+                    @input="select($event)"
+                ></v-simple-checkbox>
+
+                <div v-else class="handle" style="cursor: grab;">
+                    <v-icon color="grey darken-1">mdi-drag-vertical</v-icon>
+                </div>
+            </template>
+
             <template #item.price="{ item }" >
                 {{item.price  | currency  }}
             </template>
@@ -352,12 +453,12 @@
             </template> 
             
             
-            <template #item.slot_btn="{ item }">
-                <a :href="'item_reg.aspx?num='+item.num" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
-                <a @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>         
+            <template #item.slot_btn="{ item }" >
+                <a  v-if="!isEditing" :href="'item_reg.aspx?num='+item.num" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-pencil-box-outline"></i>修改</a>
+                <a  v-if="!isEditing" @click="deleteItem(item)" class="btn btn-outline-secondary btn-sm"><i class="mdi mdi-trash-can"></i>刪除</a>                 
             </template>
         </v-data-table> 
-        <v-container>
+        <v-container v-if="!isEditing">
             <v-row class="align-baseline" wrap>
                 <v-col cols="12" md="9">
                     <v-pagination

web/admin/activity/index2.aspx.cs

@@ -148,7 +148,7 @@ public partial class admin_activity_index2 : MyWeb.config
             }
 
             var tdesc = publicFun.enum_desc<Model.activity.category>();
-            qry = qry.OrderByDescending(o => o.num);
+            qry = qry.OrderByDescending(o => o.sort_order);
             var list = qry.ToList();
             if (list.Count > 0)
             {

web/admin/activity/item_reg.aspx

@@ -604,10 +604,7 @@
                             </div>                          
                         </div>
                         <div class="row mb-1 label-sm-right">
-                            <label class="col-sm-2 col-form-label">料號</label>
-                            <div class="col-sm-4">                             
-                                <asp:TextBox ID="PARTNO" MaxLength="100" runat="server" CssClass="form-control" placeholder="請輸入料號"></asp:TextBox>
-                            </div>
+
                             <label class="col-sm-2 col-form-label">項目名稱 *</label>
                             <div class="col-sm-4">                             
                                 <asp:TextBox ID="subject" MaxLength="100" runat="server" CssClass="form-control" placeholder="請輸入品項名稱"></asp:TextBox>

web/admin/activity/item_reg.aspx.cs

@@ -42,7 +42,6 @@ public partial class admin_activity_item_reg : MyWeb.config
                     BuildKind();
                     subject.Text = prod.subject;
                     print_init.Text = prod.print_init;
-                    PARTNO.Text = prod.partno;
                     //kind.SelectedValue = prod.kind.ToString();
                     if (prod.kind.HasValue)
                     {
@@ -118,9 +117,9 @@ public partial class admin_activity_item_reg : MyWeb.config
             L_msg.Text = "";
 
             Model.actItem actItem = new Model.actItem();//新增
+            int maxSort = _db.actItems.Max(x => (int?)x.sort_order) ?? 0;
             actItem.subject = subject.Text;            
-            actItem.print_init = print_init.Text;            
-            actItem.partno = PARTNO.Text;            
+            actItem.print_init = print_init.Text;                       
             //if (!isStrNull(kind.SelectedValue)) { actItem.kind = Val(kind.SelectedValue); } else { actItem.kind = null; }
             if (!isStrNull(category.SelectedValue)) { actItem.category = Val(category.SelectedValue); } else { actItem.category = null; }
             if (!isStrNull(kind.Value)) { actItem.kind = Val(kind.Value); } else { actItem.kind = null; }
@@ -131,6 +130,7 @@ public partial class admin_activity_item_reg : MyWeb.config
             actItem.is_reconcile = is_reconcile_item.Checked ? "Y" : "N";
             actItem.demo = demo.Text;
             actItem.customize_data = customize_data.Text;
+            actItem.sort_order = maxSort + 1;
 
             _db.actItems.Add(actItem);
             _db.SaveChanges();
@@ -167,7 +167,6 @@ public partial class admin_activity_item_reg : MyWeb.config
             {
                 actItem.subject = subject.Text;
                 actItem.print_init = print_init.Text;
-                actItem.partno = PARTNO.Text;
                 //if (!isStrNull(kind.SelectedValue)) { actItem.kind = Val(kind.SelectedValue); } else { actItem.kind = null; }
                 if (!isStrNull(category.SelectedValue)) { actItem.category = Val(category.SelectedValue); } else { actItem.category = null; }
                 if (!isStrNull(kind.Value)) { actItem.kind = Val(kind.Value); } else { actItem.kind = null; }

web/admin/activity/reg.aspx

@@ -165,6 +165,8 @@
                           { text: '* 品項名稱', value: 'act_item_selected.text', sortable: false },
                           { text: '預設金額', value: 'price', sortable: false },
                           { text: '數量', value: 'qty', sortable: false },
+                          { text: '陽上／祈福人數限制', value: 'limit_yang', sortable: false },
+                          { text: '超渡人數限制', value: 'limit_chao', sortable: false },
                           { text: '', value: 'actions', sortable: false, width: "200px" },
                       ],
                       footersDetail: {
@@ -191,6 +193,10 @@
                           price: 0,
                           qty: 0,
                           files: [],
+                          has_yang_limit: false,
+                          has_chao_limit: false,
+                          yang_limit_count: 0,
+                          chao_limit_count: 0,
                       },
                       defaultItem: {
                           id: 0,
@@ -203,6 +209,10 @@
                           price: 0,
                           qty: 0,
                           files: [],
+                          has_yang_limit: false,
+                          has_chao_limit: false,
+                          yang_limit_count: 0,
+                          chao_limit_count: 0,
                       },
                       //列印
                       data_table: {
@@ -267,10 +277,25 @@
                       order_dialog: {
                           show: false,
                       },
+                      unfilled_list: {
+                          loading: false,
+                          search: '',
+                          headers: [
+                              { text: '訂單編號', value: 'order_no' },
+                              { text: '信眾編號', value: 'f_number' },
+                              { text: '信眾姓名', value: 'u_name' },
+                              { text: '聯絡電話', value: 'phone' },
+                              { text: '建立日期', value: 'order_date' },
+                          ],
+                          items: [
+                              { order_no: "D", member_name: "S", order_date:"2025-12-07"}
+                          ],
+                      },
                   }
               },
               mounted() {
                   this.search_dialog.current = this.search_dialog.controls.search1
+                  this.loadUnfilledList();
                   //console.log("mounted");
               },
               watch: {
@@ -434,9 +459,8 @@
                       this.close();
                   },
                   spliceNullData() {
-
                       //if new data ,then splice it
-                      if (this.editedItem.num == 0) {
+                      if (this.editedItem.num == 0) { 
                           for (var i = 0; i < this.desserts.map(x => x.id).length; i++) {
                               if (this.desserts[i].id == this.editedItem.id) {
                                   this.desserts.splice(i, 1); break;
@@ -482,6 +506,10 @@
                                       actItem_num: this.editedItem.act_item_selected.val,
                                       price: this.editedItem.price,
                                       qty: this.editedItem.qty,
+                                      has_yang_limit: this.editedItem.has_yang_limit,
+                                      has_chao_limit: this.editedItem.has_chao_limit,
+                                      yang_limit_count: this.editedItem.yang_limit_count,
+                                      chao_limit_count: this.editedItem.chao_limit_count,
                                   }
                                   axios
                                       .post(HTTP_HOST + 'api/activity/SaveRelatingData', pro_order_detail)
@@ -601,10 +629,8 @@
                       //list = this.data_table.selected.map(x => x.num);
 
                       list = this.data_table.selected
-                        .sort((a, b) => (a.print_id==null?"":a.print_id).localeCompare(b.print_id==null?"":b.print_id))
-                          .map(x => x.num);
-
-                      //console.log("what:",list);
+                        .sort((a, b) => a.print_id.localeCompare(b.print_id))
+                        .map(x => x.num);
 
                       if (list.length > 0) {                           
                             // 記錄已列印
@@ -625,7 +651,7 @@
 
                                 })
                             // 送出列印
-                            _url = HTTP_HOST + 'admin/print/print_multi_new.aspx';
+                            _url = HTTP_HOST + 'admin/print/print_multi.aspx';
                             var form = document.createElement("form");
                             form.method = "POST";
                             form.action = _url;
@@ -644,10 +670,8 @@
                             addHiddenField("item", this.thisItemSelected.val);
                             addHiddenField("file", this.thisFilesSelected.val);
                             addHiddenField("list", JSON.stringify(list));
-                          addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`);
-                          //console.log("底家:",this.data_table.selected);
-                          localStorage.setItem("list", JSON.stringify(this.data_table.selected));
-                         
+                            addHiddenField("title", `${this.thisItemSelected.text} / ${this.thisFilesSelected.text}`);
+
                             /*
                             var hiddenField = document.createElement("input");
                             hiddenField.setAttribute("type", "hidden");
@@ -812,6 +836,113 @@
                       const _date = $('#<%= startDate_solar.ClientID%>').val();
                       return _subject + " " + _date;
                   },
+                  loadUnfilledList() {
+                      if (!this.this_id) return;
+
+                      this.unfilled_list.loading = true;
+
+                      axios.get(HTTP_HOST + 'api/activity/GetUnfilledOrdersByActivity/' + this.this_id)
+                          .then(response => {
+                              this.unfilled_list.items = response.data.list || [];
+                          })
+                          .catch(error => {
+                              console.log(error);
+                              this.snackbar.text = "名單載入失敗：" + error;
+                              this.snackbar.show = true;
+                          })
+                          .finally(() => {
+                              this.unfilled_list.loading = false;
+                          });
+                  },
+                  async printUnfilledList() {
+                      if (!this.this_id) return;
+
+                      try {
+                          const response = await axios.get(
+                              HTTP_HOST + `api/activity/GetUnfilledOrdersByActivity/${this.this_id}`,
+                              { params: { page: 1, pageSize: 99999 } }
+                          );
+
+                          const allItems = response.data.list || [];
+
+                          if (allItems.length === 0) {
+                              this.snackbar.text = "目前沒有未填寫品項的資料可供列印！";
+                              this.snackbar.show = true;
+                              return;
+                          }
+
+                          const activityTitle = this.titleword();
+
+                          const rows = allItems.map(item => `
+                                <tr>
+                                    <td>${item.order_no}</td>
+                                    <td>${item.f_number || ''}</td>
+                                    <td>${item.u_name}</td>
+                                    <td>${item.phone}</td>
+                                    <td>${item.order_date}</td>
+                                </tr>
+                            `).join('');
+
+                          const win = window.open('', '_blank');
+                          win.document.write(`
+                            <html>
+                            <head>
+                                <title>未填寫品項名單 - ${activityTitle}</title>
+                                <style>
+                                    body { font-family: "Microsoft JhengHei", Arial, sans-serif; padding: 20px; color: #000; }
+                                    .header-container { text-align: center; margin-bottom: 30px; }
+                                    h2 { margin-bottom: 5px; font-size: 24px; }
+                                    h4 { margin-top: 0; color: #333; font-weight: normal; }
+                                    table { width: 100%; border-collapse: collapse; }
+                                    th, td { border: 1px solid #000; padding: 10px 8px; text-align: left; font-size: 14px; }
+                                    th { background-color: #eee; font-weight: bold; }
+                                    .text-center { text-align: center; }
+                                    @media print {
+                                        @page { margin: 1.5cm; }
+                                        button { display: none; }
+                                    }
+                                </style>
+                            </head>
+                            <body>
+                                <div class="header-container">
+                                    <h2>尚未報名品項之信眾清單</h2>
+                                    <h4>活動名稱：${activityTitle}</h4>
+                                </div>
+
+                                <table>
+                                    <thead>
+                                        <tr>
+                                            <th width="18%">訂單編號</th>
+                                            <th width="15%">信眾編號</th>
+                                            <th width="20%">信眾姓名</th>
+                                            <th width="20%">聯絡電話</th>
+                                            <th width="27%">建單日期</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>${rows}</tbody>
+                                </table>
+                
+                                <div style="margin-top: 20px; text-align: right; font-size: 12px;">
+                                    列印時間：${new Date().toLocaleString()}
+                                </div>
+                            </body>
+                            </html>
+                        `);
+
+                          win.document.close();
+
+                          // 確保內容載入完成後再呼叫列印
+                          setTimeout(() => {
+                              win.print();
+                              win.close();
+                          }, 300);
+
+                      } catch (error) {
+                          console.error("列印出錯：", error);
+                          this.snackbar.text = "讀取列印資料失敗：" + error;
+                          this.snackbar.show = true;
+                      }
+                  }
               },
               computed: {
               },
@@ -831,7 +962,7 @@
     <div class="">  
         <asp:Button ID="add" runat="server" Text="送出" OnClick="add_Click" CssClass="btn btn-primary" />
         <asp:Button ID="edit" runat="server" Text="修改" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary" />
-        <asp:Button ID="goback" runat="server" Text="回列表" Visible="false" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
+        <asp:Button ID="goback" runat="server" Text="取消" Visible="true" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
     </div>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
@@ -851,6 +982,10 @@
                         <button v-if="this_id!=''" class="nav-link" id="sec2-tab3" data-bs-toggle="tab" data-bs-target="#sec2-page3"
                             type="button" role="tab" aria-controls="profile" aria-selected="false">
                             備品項目</button>
+                        <button v-if="this_id!=''" class="nav-link" id="sec2-tab4" data-bs-toggle="tab" data-bs-target="#sec2-page4"
+                            type="button" role="tab" aria-controls="profile" aria-selected="false" @click="loadUnfilledList">
+                            未填寫名單
+                        </button>
                     </div>
                 </nav>
             </div>
@@ -1023,6 +1158,54 @@
                                 <v-text-field v-model="editedItem.qty" :hide-details="true" dense single-line v-if="item.id === editedItem.id" ></v-text-field>
                                 <span v-else>{{item.qty}}</span>
                               </template>
+                               
+                              <template v-slot:item.limit_yang="{ item }">
+                                  <div class="d-flex align-center">
+                                    <v-text-field v-model="editedItem.yang_limit_count" v-if="item.id === editedItem.id"
+                                        type="number"
+                                        dense
+                                        :hide-details="true"
+                                         single-line
+                                        :disabled="!editedItem.has_yang_limit"
+                                        suffix="人" >
+                                    </v-text-field>
+                                    <v-checkbox v-if="item.id === editedItem.id"
+                                        v-model="editedItem.has_yang_limit"
+                                        label="不限"
+                                        hide-details
+                                        class="ml-2 mt-0"
+                                        :true-value="false"
+                                        :false-value="true"
+                                        :disabled="item.id !== editedItem.id">
+                                    </v-checkbox>
+                                     <span v-if="item.id !== editedItem.id && !item.has_yang_limit">不限</span>
+                                     <span v-if="item.id !== editedItem.id && item.has_yang_limit">{{item.yang_limit_count}} 人</span>
+                                </div>
+                              </template>
+                              <template v-slot:item.limit_chao="{ item }">
+                                  <div class="d-flex align-center">
+                                    <v-text-field v-model="editedItem.chao_limit_count" v-if="item.id === editedItem.id"
+                                        type="number"
+                                        dense
+                                        :hide-details="true"
+                                         single-line
+                                        :disabled="!editedItem.has_chao_limit"
+                                        suffix="人" >
+                                    </v-text-field>
+                                    <v-checkbox v-if="item.id === editedItem.id"
+                                        v-model="editedItem.has_chao_limit"
+                                        label="不限"
+                                        hide-details
+                                        class="ml-2 mt-0"
+                                        :true-value="false"
+                                        :false-value="true"
+                                        :disabled="item.id !== editedItem.id">
+                                    </v-checkbox>
+                                     <span v-if="item.id !== editedItem.id && !item.has_chao_limit">不限</span>
+                                     <span v-if="item.id !== editedItem.id && item.has_chao_limit">{{item.chao_limit_count}} 人</span>
+                                </div>
+                              </template>
+
                               <template v-slot:item.actions="{ item }">
                                 <template v-if="item.id === editedItem.id">
                                   <v-icon color="red" class="mr-2" @click="cancel">
@@ -1132,6 +1315,40 @@
 
                    
                     </div>
+
+                    <div class="tab-pane fade" id="sec2-page4" role="tabpanel" aria-labelledby="sec2-tab4" v-if="this_id!=''">
+                        <v-card class="mx-auto" outlined id="print-unfilled-area">
+                            <v-data-table 
+                                :headers="unfilled_list.headers" 
+                                :items="unfilled_list.items" 
+                                :loading="unfilled_list.loading"
+                                :search="unfilled_list.search"
+                                class="elevation-1" 
+                                fixed-header 
+                                height="350px">
+            
+                                <template v-slot:top>
+                                    <v-toolbar flat color="white" class="d-print-none">
+                                        <div class="d-flex w-100">
+                                            <v-text-field 
+                                                v-model="unfilled_list.search" 
+                                                append-icon="mdi-magnify" 
+                                                label="搜尋姓名或訂單號" 
+                                                dense outlined single-line hide-details>
+                                            </v-text-field>
+                                            <v-btn color="primary" class="ml-2 white--text" @click="printUnfilledList">
+                                                <v-icon left>mdi-printer</v-icon>列印所有名單
+                                            </v-btn>
+                                        </div>
+                                    </v-toolbar>
+                                </template>
+            
+                                <template v-slot:item.status="{ item }">
+                                    <v-chip small color="error">未選品項</v-chip>
+                                </template>
+                            </v-data-table>
+                        </v-card>
+                    </div>
                 </div>
            </asp:Panel>
         </div>

web/admin/activity/reg.aspx.cs

@@ -235,6 +235,36 @@ public partial class admin_activity_reg : MyWeb.config
     #endregion
 
     #region 資料新增
+    protected string createOrderNumber()
+    {
+        Application.Lock();
+        string order_no = "AA" + DateTime.Now.ToString("yyMMdd");
+
+        var qry = _db.companies.AsQueryable();
+        //var prod = qry.Where(q => q.last_order_no.Contains(order_no)).FirstOrDefault();
+        var prod = qry.Where(q => q.num == 1).FirstOrDefault();
+        if (prod != null)
+        {
+            if (!isStrNull(prod.last_order_no) && prod.last_order_no.Contains(order_no))
+            {
+                int tmp = Convert.ToInt32(prod.last_order_no.Replace(order_no, "")) + 1;
+                order_no = order_no + tmp.ToString("0000");
+            }
+            else
+            {
+                order_no = order_no + "0001";
+            }
+
+            prod.last_order_no = order_no;
+            _db.SaveChanges();
+        }
+        else
+            order_no = "";
+
+        Application.UnLock();
+
+        return order_no;
+    }
 
     protected void add_Click(object sender, EventArgs e)
     {
@@ -290,9 +320,10 @@ public partial class admin_activity_reg : MyWeb.config
                 int _id = activity.num;
                 if (_id > 0)
                 {
+                    RunAutoEnroll(_id);
+
                     Model.admin_log admin_log = new Model.admin_log();
                     admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Insert, subject.Text);
-
                     Response.Redirect("index.aspx");
                 }
                 else
@@ -367,6 +398,8 @@ public partial class admin_activity_reg : MyWeb.config
                     activity.category_kind = Val(category_kind.Value);
                     _db.SaveChanges();
 
+                    RunAutoEnroll(activity.num);
+
                     Model.admin_log admin_log = new Model.admin_log();
                     admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Update, subject.Text);
                 }
@@ -386,8 +419,85 @@ public partial class admin_activity_reg : MyWeb.config
         }    
     }
 
+    private void RunAutoEnroll(int activityNum)
+    {
+        var activity = _db.activities.FirstOrDefault(a => a.num == activityNum);
+        if (activity == null || !activity.startDate_solar.HasValue) return;
+
+        DateTime actDate = activity.startDate_solar.Value;
+
+        var validConfigs = _db.auto_enroll
+            .Where(ae => actDate >= ae.start_date && actDate <= ae.end_date)
+            .ToList();
+
+        foreach (var config in validConfigs)
+        {
+            if (_db.pro_order.Any(o => o.activity_num == activity.num && o.f_num == config.f_num))
+                continue;
+
+            var follower = _db.followers.FirstOrDefault(f => f.num == config.f_num);
+            if (follower == null) continue;
+
+            string newOrderNo = AutoOrderService.CreateAutoOrderNumber(_db);
+
+            Model.pro_order proOrder = new Model.pro_order
+            {
+                order_no = newOrderNo,
+                up_time = DateTime.Now,
+                reg_time = DateTime.Now,
+                keyin1 = "A01",
+                f_num = follower.num,
+                au_num = config.num,
+                phone = !string.IsNullOrEmpty(follower.cellphone) ? follower.cellphone : (follower.phone ?? ""),
+                activity_num = activity.num,
+                address = config.receipt_address ?? "",
+                receipt_title = config.receipt_title ?? "",
+                demo = "",
+                customize_data = ""
+            };
+
+            _db.pro_order.Add(proOrder);
+
+            CopyLatestOrderDetails(newOrderNo, config.f_num, (int)activity.kind);
+        }
+
+        _db.SaveChanges();
+    }
+
+    private void CopyLatestOrderDetails(string newOrderNo, int f_num, int activityKind)
+    {
+        var latestOrder = _db.pro_order
+            .Where(o => o.f_num == f_num && o.activity.kind == activityKind && _db.pro_order_detail.Any(d => d.order_no == o.order_no))
+            .OrderByDescending(o => o.order_no)
+            .FirstOrDefault();
+
+        if (latestOrder != null)
+        {
+            var prevDetails = _db.pro_order_detail.Where(d => d.order_no == latestOrder.order_no).ToList();
+            foreach (var detail in prevDetails)
+            {
+                Model.pro_order_detail newDetail = new Model.pro_order_detail
+                {
+                    order_no = newOrderNo,
+                    actItem_num = detail.actItem_num,
+                    parent_num = detail.parent_num,
+                    print_id = detail.print_id,
+                    f_num = detail.f_num,
+                    f_num_tablet = detail.f_num_tablet,
+                    address = detail.address,
+                    from_id = detail.from_id,
+                    from_id_tablet = detail.from_id_tablet,
+                    qty = detail.qty,
+                    price = detail.price,
+                    start_date = DateTime.Today,
+                    pay = 0,
+                    UpdateTime = DateTime.Now
+                };
+                _db.pro_order_detail.Add(newDetail);
+            }
+        }
+    }
+
     #endregion
 
-
-
 }

web/admin/follower/import.aspx.cs

@@ -260,7 +260,7 @@ public partial class admin_follower_import : MyWeb.config
                         follower.introducer = ValString(sheet.Cells[currentRow, 17].Text.Trim());
 
                         //檢查國籍代碼是否存在
-                        var country = _country.Where(x => x.name_zh == ValString(sheet.Cells[currentRow, 18].Text.Trim())).FirstOrDefault(); 
+                        var country = _country.Where(x => x.name_zh == ValString(sheet.Cells[currentRow, 18].Text.Trim())).FirstOrDefault();
                         if(country != null)
                         {
                             //follower.country = ValString(sheet.Cells[currentRow, 18].Text.Trim());

web/admin/follower/index.aspx

@@ -13,10 +13,12 @@
         <a @click="print_dialog.show=true" class="btn btn-outline-primary btn-print" target="_blank">
             <i class="mdi mdi-printer"></i>列印管理報表
         </a>
-        <a @click="goPrint" class="btn btn-outline-primary btn-print" target="_blank">
+        <a @click="goPrint" class="btn btn-outline-primary btn-print" :class="{ 'disabled': data_table.list.length === 0 }" target="_blank">
             <i class="mdi mdi-printer"></i>列印查詢資料
         </a>
-        <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="excel_Click"><span class="fa-solid fa-file-excel"></span> 匯出Excel</asp:LinkButton>
+        <div :style="data_table.list.length === 0 ? 'pointer-events: none; opacity: 0.5;' : ''" style="display:inline-block;">
+            <asp:LinkButton ID="excel" runat="server"  CssClass="btn btn-outline-success" OnClick="export_Click"><span class="fa-solid fa-file-excel"></span> 匯出查詢資料（Excel）</asp:LinkButton>
+        </div>
     </div>
 </asp:Content>
 <asp:Content ID="Content5" ContentPlaceHolderID="footer_script" runat="Server">
@@ -24,11 +26,13 @@
         Vue.filter('timeString', function (value, myFormat) {
             return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
         });
-        let VueApp=new Vue({
+        let VueApp = new Vue({
             el: '#app',
             vuetify: new Vuetify(vuetify_options),
             data() {
                 return {
+                    isSearched: false,
+                    print_error_msg: '',
                     options: { multiSort: false },
                     search_options: { multiSort: false },
                     data_table: {
@@ -38,10 +42,10 @@
                         singleSelect: false,
                         count: 0,
                         page: 1,
-                        pageSize: 10,                
+                        pageSize: 10,
                         header: [
                             { text: '信眾編號', value: 'f_number', align: 'start' },
-                            { text: '信眾姓名', value: 'u_name'},
+                            { text: '信眾姓名', value: 'u_name' },
                             { text: '身分別', value: 'identity_type_desc' },
                             { text: '性別', value: 'sex' },
                             { text: '生日', value: 'birthday' },
@@ -49,9 +53,9 @@
                             { text: '', value: 'slot', sortable: false },
                             { text: '', value: 'slot_btn', sortable: false, align: 'end' },
                         ],
-                        footer:{
+                        footer: {
                             showFirstLastPage: true,
-                            pageSizeOptions:[5,10,20,30],
+                            pageSizeOptions: [5, 10, 20, 30],
                         },
                     },
                     search: {
@@ -60,7 +64,7 @@
                         sex: '',
                         //birthday: new Date().toISOString().split('T')[0],
                         //birthday2: new Date().toISOString().split('T')[0]
-                        birthday:'',
+                        birthday: '',
                         birthday2: '',
                         address: '',
                         country: '',
@@ -69,14 +73,14 @@
                         /*注意這邊的參數不能跟下方print_search重複*/
                     },
                     //列印管理報表
-                    print_conditions:'yy',
+                    print_conditions: 'yy',
                     print_search: {
                         year: '',
                         month: '',
-                        season: '',                       
+                        season: '',
                     },
                     select_items: {
-                        month: [{ 
+                        month: [{
                             text: "請選擇",
                             val: 0
                         },],
@@ -126,13 +130,18 @@
                             itemsPerPageText: '',
                         },
                     },
-                    
+
                 }
             },
             watch: {
                 options: {
-                    handler() {
-                        this.getList()
+                    handler() {                    
+                        if (this.isSearched) {
+                            this.getList()
+                        }
+                        else {
+                            this.data_table.loading = false;
+                        }
                     },
                     deep: true,
                 },
@@ -141,23 +150,101 @@
                         this.search_get()
                     },
                     deep: true,
-                },    
-            }, mounted() {
+                }
+            }, mounted() {    
+                const printResult = document.getElementById('<%= hid_err_msg.ClientID %>').value;
+                document.getElementById('<%= hid_err_msg.ClientID %>').value = '';
+                window._printResult = printResult
+
                 this.search_dialog.current = this.search_dialog.controls.search1 ///default
                 this.initPrintSearch();
+                
                 const navEntries = performance.getEntriesByType("navigation");
                 const isReload = navEntries.length > 0 && navEntries[0].type === "reload";
+                
+                const url = new URL(window.location.href);
+                let params = url.searchParams;
+                if (params.get('dirty') === '1') {  // 資料有更新時執行 getlist
+                    this.search = JSON.parse(sessionStorage.getItem("member_query_params"));
+                    this.getList();
+
+                    params.delete('dirty');
+                    window.history.replaceState({}, '', url.pathname + url.search);
+                }
+
                 if (isReload) {
                     sessionStorage.removeItem("followerpage");
+                    sessionStorage.removeItem("member_list_cache");
+                    sessionStorage.removeItem("member_query_params");
+                }
+                else if ("<%=lastAddedID%>" !== "") {
+                    const newQuery = { f_number: '<%=lastAddedID%>' };
+                    sessionStorage.setItem('member_query_params', JSON.stringify(newQuery));
+                    this.search = newQuery;
+                    this.isSearched = true;
                 }
                 else {
                     const savedPage = parseInt(sessionStorage.getItem('followerpage'));
+                    const savedData = sessionStorage.getItem("member_list_cache");
+                    const savedQuery = JSON.parse(sessionStorage.getItem("member_query_params"));
+                    if (savedQuery) {
+                        this.search = savedQuery;
+                        this.isSearched = true;
+                    }
                     if (savedPage) {
                         this.options.page = savedPage;
                     }
+                    if (savedData && savedData !== "undefined") {
+                        this.data_table = JSON.parse(savedData);
+                        this.isSearched = true;
+                    }
                 }
+
+                if (printResult === 'nodata' || printResult === 'success') {
+                    this.$nextTick(() => {
+                        this.print_search.year = parseInt(document.getElementById('<%= hid_print_year.ClientID %>').value) || this.print_search.year;
+                        this.print_search.month = parseInt(document.getElementById('<%= hid_print_month.ClientID %>').value) || this.print_search.month;
+                        this.print_search.season = parseInt(document.getElementById('<%= hid_print_season.ClientID %>').value) || this.print_search.season;
+                        this.print_conditions = document.getElementById('<%= hid_print_mode.ClientID %>').value || 'yy';
+                        this.print_dialog.show = true;
+                        if (printResult === 'nodata') {
+                            this.print_error_msg = "查無資料，請重新選擇區間";
+                        }
+                    });
+                }
+                this.$nextTick(() => {
+                    setTimeout(() => {
+                        // 清空 URL
+                        const cleanUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
+                        window.history.replaceState({}, '', cleanUrl);
+                    }, 100);
+                });
             },
             methods: {
+                triggerManagementExport(mode) {
+                    this.print_dialog.show = false;
+                    this.print_error_msg = "";
+                    if (this.print_search.year == '') {
+                        msgbox('請輸入年份');
+                        return;
+                    } 
+
+                    document.getElementById('<%= hid_print_mode.ClientID %>').value = this.print_conditions;
+                    document.getElementById('<%= hid_print_year.ClientID %>').value = this.print_search.year;
+                    if (this.print_conditions == 'mm') {
+                        document.getElementById('<%= hid_print_month.ClientID %>').value = this.print_search.month;
+                    }
+                    else if (this.print_conditions == 'ss') {
+                        document.getElementById('<%= hid_print_season.ClientID %>').value = this.print_search.season;
+                    }
+
+                    if (mode === 'print') {
+                        document.getElementById('<%= print_management.ClientID %>').click();
+                    }
+                    else if (mode === "excel") {
+                        document.getElementById('<%= excel_management.ClientID %>').click();
+                    }
+                },
                 search_show(curr) {
                     //console.log("btn_click:", curr, curr.api_url);
                     this.search_dialog.current = curr;
@@ -228,6 +315,7 @@
                     //console.log(row, row["u_name"], row["f_number"], curr.id, target);
                 },
                 getList(clearpage = false) {
+                    console.log("do getlist")
                     const { sortBy, sortDesc, page, itemsPerPage } = this.options
                     const params = {
                         sortBy: sortBy[0], sortDesc: sortDesc[0],
@@ -241,6 +329,9 @@
                             this.data_table.list = response.data.list
                             this.data_table.count = response.data.count;
                             this.data_table.loading = false
+
+                            const dataToStore = JSON.stringify(this.data_table);
+                            sessionStorage.setItem("member_list_cache", dataToStore);
                         })
                         .catch(
                             error => console.log(error)
@@ -262,7 +353,7 @@
                         const index = this.data_table.list.indexOf(item)
                         if (index != -1) {
                             axios
-                                .delete(HTTP_HOST + 'api/follower/' + item.num)
+                                .delete(HTTP_HOST + 'api/follower/Delete/' + item.num)
                                 .then(response => {
                                     this.getList();
                                 })
@@ -282,18 +373,23 @@
                                 //}
                                 //this.data_table.selected = [];
                                 //this.data_table.count = this.data_table.list.length
-                                location.reload();
+                                //location.reload();
+                                this.getList();
                             })
                             .catch(error => console.log(error))
                     }
                 },
                 btn_search() {
+                    this.isSearched = true;
+                    sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
                     this.getList(true)
                     bootstrap.Offcanvas.getInstance(document.getElementById("offcanvasRight")).hide()
                 },
                 btn_all() {
+                    this.isSearched = false;
                     clearObjProps(this.search);
-                    this.btn_search()
+                    sessionStorage.setItem("member_query_params", JSON.stringify(this.search));
+                    //this.btn_search()
                 },   
                 goPrint() {
                     //debugger;
@@ -309,6 +405,7 @@
                 //列印管理報表
                 print_close() {
                     this.print_dialog.show = false;
+                    this.print_error_msg = "";
                 }
                 ,
                 initPrintSearch() {
@@ -391,10 +488,31 @@
             $('#country2').val('');
             VueApp.search.country2 = '';
         });
+        
+        $(document).ready(function () {
+            // 判斷是否彈出 search dialog
+            let hasSearchResult = sessionStorage.getItem("member_list_cache") !== null;
+
+            if (!hasSearchResult && window._printResult === '') {
+                let $btn = $("a[data-bs-target='#offcanvasRight'][href='#search_panel']");
+                $btn.click();
+                let el = document.getElementById('offcanvasRight');
+                let offcanvas = bootstrap.Offcanvas.getOrCreateInstance(el);
+                offcanvas.show();
+            }
+        });
     </script>   
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
     <uc1:alert runat="server" ID="L_msg" Text="" />
+    <asp:HiddenField ID="hid_err_msg" runat="server" />
+    <asp:HiddenField ID="hid_print_year" runat="server" />
+    <asp:HiddenField ID="hid_print_month" runat="server" />
+    <asp:HiddenField ID="hid_print_season" runat="server" />
+    <asp:HiddenField ID="hid_print_mode" runat="server" />
+    <asp:HiddenField ID="hid_qry" runat="server" />
+    <asp:LinkButton ID="excel_management" runat="server" OnClick="export_Click" style="display:none;" />
+    <asp:LinkButton ID="print_management" runat="server" OnClick="export_Click" style="display:none;" />
     <div id="content" class="container-fluid">
         <v-data-table 
             v-model="data_table.selected"
@@ -508,9 +626,17 @@
                          </v-col>
                              
                     </v-row> 
+                    <v-row>
+                        <v-col>
+                            <div v-if="print_error_msg" class="red--text mt-2 text-center" style="font-weight: bold;">
+                                {{ print_error_msg }}
+                            </div>
+                        </v-col>
+                    </v-row>
                     <v-row  densee class="pt-3" >
                           <v-col  :cols="12"  class="pt-3 text-center" > 
-                                <v-btn class="ma-2" color="primary" dark  @click="goPrint2" >  列印 </v-btn>
+                                <v-btn class="ma-2" color="primary" dark  @click="triggerManagementExport('print')" >  列印 </v-btn>
+                                <v-btn class="ma-2" color="primary" dark  @click="triggerManagementExport('excel')">  匯出 Excel </v-btn>
                                 <v-btn class="ma-2" color="green" dark  @click="print_close" >  取消 </v-btn>
                           </v-col>                                   
                     </v-row>    

web/admin/follower/index.aspx.cs

@@ -1,17 +1,20 @@
-using System;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.OleDb;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using System.Configuration;
-using System.IO;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Spreadsheet;
-using System.Linq;
+using System.Windows.Controls;
+using System.Windows.Interop;
 using static TreeView;
 
 
@@ -19,16 +22,22 @@ public partial class admin_follower_index : MyWeb.config
 {
     public int page = 1;
     private Model.ezEntities _db = new Model.ezEntities();
+    protected string lastAddedID;
     protected void Page_Load(object sender, EventArgs e)
     {
-     
+
         if (!IsPostBack)
         {
+            if (Session["LastAddedID"] != null)
+            {
+                lastAddedID = Session["LastAddedID"].ToString();
+                Session.Remove("LastAddedID");
+            }
             BuildKind();
         }
         else
         {
-                   
+            
         }
 
     }
@@ -42,10 +51,10 @@ public partial class admin_follower_index : MyWeb.config
         //國籍
         s_country.Items.Clear();
         s_country.Items.Add(new ListItem("請選擇", ""));
-        var qry =_db.countries.OrderBy(x => x.range).ThenBy(x => x.name_en).ToList();
+        var qry = _db.countries.OrderBy(x => x.range).ThenBy(x => x.name_en).ToList();
         if (qry.Count > 0)
-        { 
-            foreach(var x in qry)           
+        {
+            foreach (var x in qry)
                 s_country.Items.Add(new ListItem(x.name_zh, x.ID));
         }
 
@@ -68,208 +77,310 @@ public partial class admin_follower_index : MyWeb.config
     #endregion
 
 
-    #region 匯出Excel
+    #region 匯出
 
-    protected void excel_Click(object sender, EventArgs e)
+    protected void export_Click(object sender, EventArgs e)
     {
         var memoryStream = new MemoryStream();
-        using (var doc = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
+
+        LinkButton btn = sender as LinkButton;
+        if (btn == null) return;
+        bool isPrintMode = (btn.ID == "print_management");
+        bool isExcelMode = (btn.ID == "excel_management" || btn.ID == "excel");
+        bool isManagementMode = (btn.ID == "excel_management" || btn.ID == "print_management");
+
+        //查詢要匯出的資料
+        string _query = "";     // 紀錄匯出條件
+        var list = searchData(ref _query, isManagementMode);
+
+        if (isExcelMode)
         {
-            var wb = doc.AddWorkbookPart();
-            wb.Workbook = new Workbook();
-            var sheets = wb.Workbook.AppendChild(new Sheets());
-
-            //建立第一個頁籤
-            var ws = wb.AddNewPart<WorksheetPart>();
-            ws.Worksheet = new Worksheet();
-            sheets.Append(new Sheet()
-            {
-                Id = wb.GetIdOfPart(ws),
-                SheetId = 1,
-                Name = "信眾資料"
-            });
-
-            //設定欄寬
-            var cu = new Columns();
-            cu.Append(
-                new Column { Min = 1, Max = 2, Width = 15, CustomWidth = true },
-                new Column { Min = 3, Max = 3, Width = 10, CustomWidth = true },
-                new Column { Min = 4, Max = 11, Width = 15, CustomWidth = true },
-                new Column { Min = 12, Max = 12, Width = 25, CustomWidth = true },
-                new Column { Min = 13, Max = 13, Width = 8, CustomWidth = true },
-                new Column { Min = 14, Max = 14, Width = 35, CustomWidth = true },
-                new Column { Min = 15, Max = 16, Width = 15, CustomWidth = true }
-            );
-            ws.Worksheet.Append(cu);
-
-            //建立資料頁
-            var sd = new SheetData();
-            ws.Worksheet.AppendChild(sd);
-
-            //第一列資料
-            var tr = new Row();
-            tr.Append(
-                new Cell() { CellValue = new CellValue("信眾編號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("信眾姓名"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("性別"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("身分別"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("生日(國曆)"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("聯絡電話"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("手機號碼"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依道場"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依法名"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("皈依日期"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("加入日期"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("緊急連絡人"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("緊急連絡人電話"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("血型"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("國籍"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("收件地址"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("介紹人"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("LINE帳號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("其它社群帳號"), DataType = CellValues.String },
-                new Cell() { CellValue = new CellValue("建檔日期"), DataType = CellValues.String }
-                ,new Cell() { CellValue = new CellValue("身分證號"), DataType = CellValues.String }
-                //,new Cell() { CellValue = new CellValue("SHA"), DataType = CellValues.String }
-            );
-            sd.AppendChild(tr);
-
-            //查詢要匯出的資料
-            
-            //紀錄匯出條件
-             string _query = "";
-            
-            var list = searchData(ref _query);
             if (list.Count > 0)
             {
-                MyWeb.encrypt encrypt = new MyWeb.encrypt();
-                Model.country country = new Model.country();
-                var tdesc = publicFun.enum_desc<Model.follower.type>();
-                foreach (var item in list)
+                using (var doc = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
                 {
-                    //新增資料列
-                    tr = new Row();
-                    string s1, s2, sha;
-                    s1= encrypt.DecryptAutoKey(item.phone);
-                    s2= encrypt.DecryptAutoKey(item.id_code);
-                    sha = encrypt.followerHash(s1, s2);
+                    var wb = doc.AddWorkbookPart();
+                    wb.Workbook = new Workbook();
+                    var sheets = wb.Workbook.AppendChild(new Sheets());
+
+                    //建立第一個頁籤
+                    var ws = wb.AddNewPart<WorksheetPart>();
+                    ws.Worksheet = new Worksheet();
+                    sheets.Append(new Sheet()
+                    {
+                        Id = wb.GetIdOfPart(ws),
+                        SheetId = 1,
+                        Name = "信眾資料"
+                    });
+
+                    //設定欄寬
+                    var cu = new Columns();
+                    cu.Append(
+                        new Column { Min = 1, Max = 2, Width = 15, CustomWidth = true },
+                        new Column { Min = 3, Max = 3, Width = 10, CustomWidth = true },
+                        new Column { Min = 4, Max = 11, Width = 15, CustomWidth = true },
+                        new Column { Min = 12, Max = 12, Width = 25, CustomWidth = true },
+                        new Column { Min = 13, Max = 13, Width = 8, CustomWidth = true },
+                        new Column { Min = 14, Max = 14, Width = 35, CustomWidth = true },
+                        new Column { Min = 15, Max = 16, Width = 15, CustomWidth = true }
+                    );
+                    ws.Worksheet.Append(cu);
+
+                    //建立資料頁
+                    var sd = new SheetData();
+                    ws.Worksheet.AppendChild(sd);
+
+                    //第一列資料
+                    var tr = new Row();
                     tr.Append(
-                        new Cell() { CellValue = new CellValue(item.f_number), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.u_name), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.sex), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(!isStrNull(item.identity_type)? tdesc[item.identity_type ?? 1] :""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.birthday.HasValue ? ValDate(item.birthday.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.phone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.cellphone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refuge_area), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refuge_name), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.refugedate.HasValue ? ValDate(item.refugedate.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },                   
-                        new Cell() { CellValue = new CellValue(item.join_date.HasValue ? ValDate(item.join_date.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },                   
-                        new Cell() { CellValue = new CellValue(item.contactor), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.contactor_phone)), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.blood), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(!isStrNull(item.country) ? item.country1.name_zh : ""), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.address), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.introducer), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.socialid1), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.socialid2), DataType = CellValues.String },
-                        new Cell() { CellValue = new CellValue(item.reg_time.HasValue ? ValDate(item.reg_time.Value).ToString("yyyy/MM/dd HH:mm:ss") : ""), DataType = CellValues.String }
-                        ,new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.id_code)), DataType = CellValues.String }
-                        //, new Cell() { CellValue = new CellValue(sha), DataType = CellValues.String }
-                        );
+                        new Cell() { CellValue = new CellValue("信眾編號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("信眾姓名"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("性別"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("身分別"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("生日(國曆)"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("聯絡電話"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("手機號碼"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依道場"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依法名"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("皈依日期"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("加入日期"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("緊急連絡人"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("緊急連絡人電話"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("血型"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("國籍"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("收件地址"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("介紹人"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("LINE帳號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("其它社群帳號"), DataType = CellValues.String },
+                        new Cell() { CellValue = new CellValue("建檔日期"), DataType = CellValues.String }
+                        , new Cell() { CellValue = new CellValue("身分證號"), DataType = CellValues.String }
+                    //,new Cell() { CellValue = new CellValue("SHA"), DataType = CellValues.String }
+                    );
                     sd.AppendChild(tr);
+
+
+                    MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                    Model.country country = new Model.country();
+                    var tdesc = publicFun.enum_desc<Model.follower.type>();
+                    foreach (var item in list)
+                    {
+                        //新增資料列
+                        tr = new Row();
+                        string s1, s2, sha;
+                        s1 = encrypt.DecryptAutoKey(item.phone);
+                        s2 = encrypt.DecryptAutoKey(item.id_code);
+                        sha = encrypt.followerHash(s1, s2);
+                        tr.Append(
+                            new Cell() { CellValue = new CellValue(item.f_number), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.u_name), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.sex), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(!isStrNull(item.identity_type) ? tdesc[item.identity_type ?? 1] : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.birthday.HasValue ? ValDate(item.birthday.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.phone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.cellphone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refuge_area), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refuge_name), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.refugedate.HasValue ? ValDate(item.refugedate.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.join_date.HasValue ? ValDate(item.join_date.Value).ToString("yyyy/MM/dd") : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.contactor), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.contactor_phone)), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.blood), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(!isStrNull(item.country) ? item.country1.name_zh : ""), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.address), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.introducer), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.socialid1), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.socialid2), DataType = CellValues.String },
+                            new Cell() { CellValue = new CellValue(item.reg_time.HasValue ? ValDate(item.reg_time.Value).ToString("yyyy/MM/dd HH:mm:ss") : ""), DataType = CellValues.String }
+                            , new Cell() { CellValue = new CellValue(encrypt.DecryptAutoKey(item.id_code)), DataType = CellValues.String }
+                            //, new Cell() { CellValue = new CellValue(sha), DataType = CellValues.String }
+                            );
+                        sd.AppendChild(tr);
+                    }
+
+                    //空一列
+                    tr = new Row();
+                    sd.AppendChild(tr);
+
+                    //匯出資訊
+                    string _data = "匯出時間 : " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    _data += " " + admin.info.u_id;
+                    tr = new Row();
+                    tr.Append(
+                            new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
+                                );
+                    sd.AppendChild(tr);
+
+                    _data = "匯出條件 : " + (!isStrNull(_query) ? _query : "-");
+                    tr = new Row();
+                    tr.Append(
+                            new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
+                                );
+                    sd.AppendChild(tr);
+
+
+                    Model.admin_log admin_log = new Model.admin_log();
+                    admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Excel, admin_log.LogViewBtn(list.Select(x => x.f_number + x.u_name).ToList()));
+
+
                 }
+                HttpContext.Current.Response.Clear();
+                HttpContext.Current.Response.AddHeader("content-disposition", "attachment;  filename=信眾_data.xlsx");
+                HttpContext.Current.Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+                HttpContext.Current.Response.BinaryWrite(memoryStream.ToArray());
+                HttpContext.Current.Response.End();
 
-                //空一列
-                tr = new Row();
-                sd.AppendChild(tr);
-
-                //匯出資訊
-                string _data = "匯出時間 : " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
-                _data += " " + admin.info.u_id;
-                tr = new Row();
-                tr.Append(
-                       new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
-                         );
-                sd.AppendChild(tr);
-
-                _data = "匯出條件 : " + (!isStrNull(_query) ? _query : "-");
-                tr = new Row();
-                tr.Append(
-                       new Cell() { CellValue = new CellValue(_data), DataType = CellValues.String }
-                         );
-                sd.AppendChild(tr);
-
-
-                Model.admin_log admin_log = new Model.admin_log();
-                admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Excel, admin_log.LogViewBtn(list.Select(x => x.f_number + x.u_name).ToList()));
-
+                hid_err_msg.Value = "success";
             }
             else
             {
-                ScriptMsg2("查無資料");
+                //ScriptMsg2("查無資料");
+                hid_err_msg.Value = "nodata";
             }
         }
+        else if (isPrintMode)
+        {
+            string urlParams = "";
+            int selYear = !string.IsNullOrEmpty(hid_print_year.Value) ? int.Parse(hid_print_year.Value) : 0;
+            int selMonth = !string.IsNullOrEmpty(hid_print_month.Value) ? int.Parse(hid_print_month.Value) : 0;
+            int selSeason = !string.IsNullOrEmpty(hid_print_season.Value) ? int.Parse(hid_print_season.Value) : 0;
+            string selMode = !string.IsNullOrEmpty(hid_print_mode.Value) ? hid_print_mode.Value : "";
+            
+            var qry = _db.followers.AsQueryable();
+            if (selYear > 0)
+            {
+                urlParams += "&year=" + selYear;
+            }
+            if (selMode == "mm" && selMonth > 0)
+            {
+                urlParams += "&month=" + selMonth;
+            }
+            else if (selMode == "ss" && selSeason > 0)
+            {
+                urlParams += "&season=" + selSeason;
+            }
 
-        HttpContext.Current.Response.Clear();
-        HttpContext.Current.Response.AddHeader("content-disposition", "attachment;  filename=信眾_data.xlsx");
-        HttpContext.Current.Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-        HttpContext.Current.Response.BinaryWrite(memoryStream.ToArray());
-        HttpContext.Current.Response.End();
+            if (list.Count > 0)
+            {
+                hid_err_msg.Value = "success";
+                hid_print_year.Value = selYear.ToString();
+                hid_print_month.Value = selMonth.ToString();
+                hid_print_season.Value = selSeason.ToString();
+                hid_print_mode.Value = selMode;
 
+                string script = $@"window.open('print.aspx?{urlParams}&mode={selMode}', '列印信眾資料', 'noopener,noreferrer');";
+                ScriptManager.RegisterStartupScript(this, GetType(), "ExecutePrint", script, true);
+            }
+            else
+            {
+                hid_err_msg.Value = "nodata";
+            }
+        }   
     }
-    protected List<Model.follower> searchData(ref string _query)
+    protected List<Model.follower> searchData(ref string _query, bool isManagementMode = false)
     {
 
         //查詢要匯出的資料
         var qry = _db.followers.AsQueryable();
 
-        //紀錄匯出條件
-        if (!isStrNull(s_f_number.Value))
+        // 管理報表
+        if (isManagementMode)
         {
-            qry = qry.Where(o => o.f_number.Contains(s_f_number.Value.Trim()));
-           
-                _query += "信眾編號:" + s_f_number.Value.Trim() + "\n";
-           
-        }
+            int selYear = !string.IsNullOrEmpty(hid_print_year.Value) ? int.Parse(hid_print_year.Value) : 0;
+            int selMonth = !string.IsNullOrEmpty(hid_print_month.Value) ? int.Parse(hid_print_month.Value) : 0;
+            int selSeason = !string.IsNullOrEmpty(hid_print_season.Value) ? int.Parse(hid_print_season.Value) : 0;
+            string selMode = !string.IsNullOrEmpty(hid_print_mode.Value) ? hid_print_mode.Value : "";
 
-        if (!isStrNull(s_u_name.Value))
-        {
-            qry = qry.Where(o => o.u_name.Contains(s_u_name.Value.Trim()));
-            
-                _query += "信眾姓名:" + s_u_name.Value.Trim() + "\n";
-          
-        }
-        if (!isStrNull(s_address.Value))
-        {
-            qry = qry.Where(o => o.address.Contains(s_address.Value.Trim()));
-            _query += "地址:" + s_u_name.Value.Trim() + "\n";
-        }
-        
-        // 電話/證號搜尋 (使用 search_keywords HEX 編碼)
-        if (!isStrNull(s_phone_idcode.Value) && GlobalVariables.UseSearchKeywords)
-        {
-            MyWeb.encrypt encrypt = new MyWeb.encrypt();
-            string hexSearch = encrypt.ConvertToHex(s_phone_idcode.Value.Trim());
-            if (!string.IsNullOrEmpty(hexSearch))
+            if (selYear > 0)
             {
-                qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
-                _query += "電話/證號:" + s_phone_idcode.Value.Trim() + "\n";
+                qry = qry.Where(o => o.join_date.HasValue && o.join_date.Value.Year == selYear);
+                _query += "年份:" + selYear + "\n";
             }
+            if (selMode == "mm" && selMonth > 0)
+            {
+                qry = qry.Where(o => o.join_date.HasValue && o.join_date.Value.Month == selMonth);
+                _query += "月份:" + selMonth + "\n";
+            }
+            else if (selMode == "ss" && selSeason > 0)
+            {
+                if (selSeason == 1)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 1 || o.join_date.Value.Month == 2 || o.join_date.Value.Month == 3);
+                }
+                else if (selSeason == 2)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 4 || o.join_date.Value.Month == 5 || o.join_date.Value.Month == 6);
+                }
+                else if (selSeason == 3)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 7 || o.join_date.Value.Month == 8 || o.join_date.Value.Month == 9);
+                }
+                else if (selSeason == 4)
+                {
+                    qry = qry.Where(o => o.join_date.HasValue)
+                        .Where(o => o.join_date.Value.Month == 10 || o.join_date.Value.Month == 11 || o.join_date.Value.Month == 12);
+                }
+
+                _query += "季度:" + selSeason + "\n";
+            }
+
+            qry = qry.OrderByDescending(o => o.num);
+            return qry.ToList();
         }
-        
-        if (!isStrNull(s_birthday.Value) && isDate(s_birthday.Value))
+        else
+        // 匯出查詢資料
         {
-            qry = qry.Where(o => o.birthday >= ValDate(s_birthday.Value));
-            _query += "生日(起):" + s_birthday.Value.Trim() + "\n";
+            //紀錄匯出條件
+            if (!isStrNull(s_f_number.Value))
+            {
+                qry = qry.Where(o => o.f_number.Contains(s_f_number.Value.Trim()));
+
+                _query += "信眾編號:" + s_f_number.Value.Trim() + "\n";
+
+            }
+
+            if (!isStrNull(s_u_name.Value))
+            {
+                qry = qry.Where(o => o.u_name.Contains(s_u_name.Value.Trim()));
+
+                _query += "信眾姓名:" + s_u_name.Value.Trim() + "\n";
+
+            }
+            if (!isStrNull(s_address.Value))
+            {
+                qry = qry.Where(o => o.address.Contains(s_address.Value.Trim()));
+                _query += "地址:" + s_address.Value.Trim() + "\n";
+            }
+            
+            // 電話/證號搜尋 (使用 search_keywords HEX 編碼)
+            if (!isStrNull(s_phone_idcode.Value) && GlobalVariables.UseSearchKeywords)
+            {
+                MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                string hexSearch = encrypt.ConvertToHex(s_phone_idcode.Value.Trim());
+                if (!string.IsNullOrEmpty(hexSearch))
+                {
+                    qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
+                    _query += "電話/證號:" + s_phone_idcode.Value.Trim() + "\n";
+                }
+            }
+
+            if (!isStrNull(s_birthday.Value) && isDate(s_birthday.Value))
+            {
+                var tmp_s_birthday = ValDate(s_birthday.Value);
+                qry = qry.Where(o => o.birthday >= tmp_s_birthday);
+                _query += "生日(起):" + s_birthday.Value.Trim() + "\n";
+            }
+            if (!isStrNull(s_birthday2.Value) && isDate(s_birthday2.Value))
+            {
+                var tmp_s_birthday2 = Convert.ToDateTime(s_birthday2.Value).AddDays(1);
+                qry = qry.Where(o => o.birthday < tmp_s_birthday2);
+                _query += "生日(訖):" + s_birthday2.Value.Trim() + "\n";
+            }
+            qry = qry.OrderByDescending(o => o.num);
+            return qry.ToList();
         }
-        if (!isStrNull(s_birthday2.Value) && isDate(s_birthday2.Value))
-        {
-            qry = qry.Where(o => o.birthday < Convert.ToDateTime(s_birthday2.Value).AddDays(1));
-            _query += "生日(訖):" + s_birthday2.Value.Trim() + "\n";
-        }
-        qry = qry.OrderByDescending(o => o.num);
-       return qry.ToList();
 
     }
 

web/admin/follower/order_record.aspx

@@ -8,6 +8,7 @@
              <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
          </div>
     </div>
+     <a href="index.aspx" class="btn btn-outline-secondary">返回</a>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="container-fluid">

web/admin/follower/order_record_detail.aspx

@@ -4,10 +4,11 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="page_nav" Runat="Server">
     <div class="scroll-nav nav nav-tabs mb-2 mb-sm-0 d-none d-sm-flex">
-     <div class="ms-3">
-         <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
-     </div>
-</div>
+         <div class="ms-3">
+             <span>信眾姓名:</span><asp:Literal runat="server" ID="username"></asp:Literal>
+         </div>
+    </div>
+    <a href="order_record.aspx?userid=<%=Request["userid"] %>" class="btn btn-outline-secondary">返回</a>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
     <div class="container-fluid">

web/admin/follower/print.aspx.cs

@@ -3,6 +3,7 @@ using DocumentFormat.OpenXml.Vml.Office;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
@@ -26,7 +27,7 @@ public partial class admin_follower_print_ : System.Web.UI.Page
                 //紀錄匯出條件
                 string _query = "";
                 var qry = _db.followers.AsQueryable();
-                
+
                 // ❌ 錯誤寫法: qry = qry.Where(o => o.f_number.Contains(Request["f_number"].Trim()));
                 // LINQ to Entities 無法轉換 Request[] 方法，必須先轉換為變數再使用
                 string fNumberParam = Request["f_number"]?.Trim();
@@ -60,7 +61,8 @@ public partial class admin_follower_print_ : System.Web.UI.Page
                 if (!string.IsNullOrEmpty(Request["birthday2"]))
                 {
                     DateTime birthday2Param = Convert.ToDateTime(Request["birthday2"].Trim());
-                    qry = qry.Where(o => o.birthday < birthday2Param.AddDays(1));
+                    var tmpBirthday2Param = birthday2Param.AddDays(1);
+                    qry = qry.Where(o => o.birthday < tmpBirthday2Param);
                     _query += "生日(訖):" + birthday2Param.ToString("yyyy/MM/dd") + "\n";
                 }
                 // ❌ 錯誤寫法: _db.countries.Where(x => x.ID == Request["country"].ToString())
@@ -85,7 +87,19 @@ public partial class admin_follower_print_ : System.Web.UI.Page
                     }
                     _query += "國家:" + (_db.countries.Where(x => x.ID == country2Id).Select(x => x.name_zh).FirstOrDefault() ?? "") + "\n";
                 }
-                
+
+                string phone_ipcode = Request["phone_idcode"]?.ToString();
+                if (!string.IsNullOrEmpty(phone_ipcode) && GlobalVariables.UseSearchKeywords)
+                {
+                    MyWeb.encrypt encrypt = new MyWeb.encrypt();
+                    string hexSearch = encrypt.ConvertToHex(phone_ipcode.Trim());
+                    if (!string.IsNullOrEmpty(hexSearch))
+                    {
+                        qry = qry.Where(o => o.search_keywords != null && o.search_keywords.Contains(hexSearch));
+                        _query += "電話/證號:" + phone_ipcode.Trim() + "\n";
+                    }
+                }
+
                 //管理報表
                 if (!string.IsNullOrEmpty(Request["year"]))
                 {

web/admin/follower/reg.aspx

@@ -116,6 +116,7 @@
             vuetify: new Vuetify(vuetify_options),
             data() {
                 return {
+                    last_confirmed_date: '',
                     tabArray: tabtmp,
                     tabArray2: "",
                     follower_id: '<%= Request["num"] %>',
@@ -124,6 +125,20 @@
                         multiSort: false,
                         //itemsPerPage: -1,
                     },
+                    confirm_dialog: {
+                        show: false,
+                        headers: [
+                            { text: '活動日期', value: 'activitydate' },
+                            { text: '活動名稱', value: 'activityname'},
+                        ],
+                        title: '',
+                        desc: '',
+                        orders: [],
+                        pendingData: null,
+                        pendingDeleteItem: null,
+                        btn_cancel_text: '', // 「取消報名」按鈕文字
+                        btn_keep_text: ''    // 「保留活動」按鈕文字
+                    },
                     search_dialog: {
                         controls: {
                             search1: {
@@ -190,7 +205,7 @@
                                 text_prop: 'name_zh',
                                 value_prop: 'id',
                                 keys: [
-                                    { id: 'keyword', title: '關鍵字' },                                 
+                                    { id: 'keyword', title: '關鍵字' },
                                 ],
                                 api_url: HTTP_HOST + 'api/country/GetList',
                                 columns: [
@@ -208,11 +223,11 @@
                                 title: '稱謂',
                                 text_prop: 'title',
                                 value_prop: 'num',
-                                keys: [                                   
+                                keys: [
                                 ],
                                 api_url: HTTP_HOST + 'api/appellation/GetList',
                                 columns: [
-                                    { id: 'title', title: '稱謂' },                                  
+                                    { id: 'title', title: '稱謂' },
                                 ],
                                 selected: {},
                                 select(item, index, t) {
@@ -230,7 +245,7 @@
                                     { id: 'f_number', title: '編號' },
                                     { id: 'u_name', title: '姓名' },
                                     { id: 'address', title: '地址' },
-                                    { id: 'onlyfamily', title: '只查親屬'},
+                                    { id: 'onlyfamily', title: '只查親屬' },
                                 ],
                                 api_url: HTTP_HOST + 'api/follower/GetList',
                                 columns: [
@@ -241,7 +256,7 @@
                                 selected: {},
                                 select(item, index, t) {
                                     console.log("select search5", t);
-                                   
+
                                 }
                             },
                         },
@@ -314,10 +329,10 @@
                         birthday: '',
                         phoneDes: '',
                         demo: '',
-                        appellation_id_selected :
+                        appellation_id_selected:
                         {
-                            text : '',
-                            val : 0,
+                            text: '',
+                            val: 0,
                         },
 
                     },
@@ -372,33 +387,33 @@
                     ],
                     tabletsDetail: { multiSort: false },
                     tabletTable: {
-                        Loading:true,
+                        Loading: true,
                         disableButton: true,
                         searchDetail: '',
                         headersDetail: [
-                            { text: '超渡/陽上', value: 'type', sortable: false, width: "100px" },                          
-                            { text: '* 牌位標題', value: 'title', sortable: true },                          
+                            { text: '超渡/陽上', value: 'type', sortable: false, width: "100px" },
+                            { text: '* 牌位標題', value: 'title', sortable: true },
                             { text: '', value: 'actions', sortable: false, width: "100px" },
-                        ],               
+                        ],
                         desserts: [],
                         desserts_count: 0,
                         editedIndex: -1,
                         editedItem: {
                             id: 0,
-                            num: 0,                  
-                            f_num: 0,  
-                            title: '',            
+                            num: 0,
+                            f_num: 0,
+                            title: '',
                         },
                         defaultItem: {
                             id: 0,
-                            num: 0,                       
-                            f_num: 0,   
+                            num: 0,
+                            f_num: 0,
                             type: this.selectedTabletType,
-                            title:'',
+                            title: '',
                         },
                     },
                     //新:家人
-                    family:{
+                    family: {
                         dialog: false,
                         isEditing: false,
                         is_tw: true,
@@ -420,8 +435,8 @@
                             chinese_year: "",
                             zodiac: "",
                             birth_time: "",
-                            city:"",
-                            area:"",
+                            city: "",
+                            area: "",
                             address: "",
                             phone: "",
                             mobile: "",
@@ -440,8 +455,8 @@
                             chinese_year: "",
                             zodiac: "",
                             birth_time: "",
-                            city:"",
-                            area:"",
+                            city: "",
+                            area: "",
                             address: "",
                             phone: "",
                             mobile: "",
@@ -454,15 +469,65 @@
                             { text: '', value: 'actions', sortable: false, width: "100px" },
                         ],
                     },
+                    // 全年報名表格
+                    auto_enroll: {
+                        headers: [
+                            { text: '開始日期（西元）', value: 'auto_enroll_start_date', sortable: false },
+                            { text: '結束日期（西元）', value: 'auto_enroll_end_date', sortable: false },
+                            { text: '收據抬頭', value: 'auto_enroll_receipt_title', sortable: false },
+                            { text: '收據地址', value: 'auto_enroll_receipt_address', sortable: false },
+                            { text: '狀態', value: 'auto_enroll_status', sortable: false },
+                            { text: '', value: 'actions', sortable: false, width: "150px" },
+                        ],
+                        items: [],
+                        editedIndex: -1,
+                        editedItem: {
+                            num: 0,
+                            auto_enroll_start_date: '',
+                            auto_enroll_end_date: '',
+                            auto_enroll_receipt_title: '',
+                            auto_enroll_receipt_address: '',
+                        },
+                        defaultItem: {
+                            num: 0,
+                            auto_enroll_start_date: '',
+                            auto_enroll_end_date: '',
+                            auto_enroll_receipt_title: '',
+                            auto_enroll_receipt_address: '',
+                        },
+                        search:""
+                    },
+                    unfilled_dialog: {
+                        show: false,
+                        headers: [
+                            { text: '報名單號', value: 'order_no', sortable: false },
+                            { text: '活動分類', value: 'category', sortable: false },
+                            { text: '活動名稱', value: 'activityname', sortable: false },
+                            { text: '開始日期', value: 'startdate', sortable: false },
+                            { text: '結束日期', value: 'enddate', sortable: false },
+                        ],
+                        items: [],
+                        footer: {
+                            showFirstLastPage: true,
+                            disableItemsPerPage: true,
+                            itemsPerPageAllText: '',
+                            itemsPerPageText: '',
+                            current_item: null,
+                        },
+                        count: 0,
+                        page: 1,
+                        pageSize: 10,
+                        loading: false,
+                    },
                     cityOptions: [], // 城市選項
                     areaOptions: {}, // 區域選項
                     //天干地支:甲子, 乙丑...
                     chineseYears: [
-                        '甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉', 
-                        '甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未', 
-                        '甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳', 
-                        '甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯', 
-                        '甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑', 
+                        '甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉',
+                        '甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未',
+                        '甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳',
+                        '甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯',
+                        '甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑',
                         '甲寅', '乙卯', '丙辰', '丁巳', '戊午', '己未', '庚申', '辛酉', '壬戌', '癸亥'
                     ],
                     //生肖
@@ -485,7 +550,7 @@
                     ]
                 }
             },
-            mounted() {//一開始就載入
+            mounted() {
                 this.search_dialog.current = this.search_dialog.controls.search1 ///default
                 //console.log("mounted");
                 //this.initialize();
@@ -494,6 +559,7 @@
                 this.getFamilyMembers();
                 this.getCityOptions();
                 this.onCityChange();
+                this.initAutoEnroll();
             },
             watch: {
                 options: {
@@ -537,6 +603,323 @@
                 }
             },
             methods: {
+                initAutoEnroll() {
+                    if (this.follower_id != '') {
+                        axios.get(HTTP_HOST + `api/follower/GetAutoEnrollList/${this.follower_id}`)
+                            .then(response => {
+                                this.auto_enroll.items = response.data.list.map(item => ({
+                                    ...item,
+                                    id: item.num
+                                }));
+                            })
+                    }
+                },
+                // 取得報名狀態
+                getEnrollStatus(item) {
+                    const today = new Date();
+                    today.setHours(0, 0, 0, 0);
+                    const start = new Date(item.auto_enroll_start_date);
+                    const end = new Date(item.auto_enroll_end_date);
+                    if (today < start) return { label: '未開始', color: 'blue lighten-4', textColor: 'blue darken-3' };
+                    if (today > end) return { label: '已結束', color: 'grey lighten-2', textColor: 'grey darken-2' };
+                    return { label: '報名中', color: 'green lighten-4', textColor: 'green darken-3' };
+                },
+                // 新增
+                auto_enroll_add() {
+                    if (this.auto_enroll.editedIndex !== -1) return;
+
+                    const newItem = {
+                        ...this.auto_enroll.defaultItem,
+                        id: -Date.now()
+                    };
+                    this.auto_enroll.items.unshift(newItem);
+                    this.auto_enroll.editedItem = { ...newItem };
+                    this.auto_enroll.editedIndex = 0;
+                },
+                // 編輯
+                auto_enroll_edit(item) {
+                    this.auto_enroll.editedIndex = this.auto_enroll.items.indexOf(item);
+                    this.auto_enroll.editedItem = { ...item };
+                },
+                // 取消
+                auto_enroll_cancel() {
+                    // 若是新增的空白列，取消時移除
+                    const item = this.auto_enroll.items[this.auto_enroll.editedIndex];
+                    if (item && !item.auto_enroll_start_date && !item.auto_enroll_end_date) {
+                        this.auto_enroll.items.splice(this.auto_enroll.editedIndex, 1);
+                    }
+                    this.auto_enroll.editedItem = { ...this.auto_enroll.defaultItem };
+                    this.auto_enroll.editedIndex = -1;
+                },
+                // 儲存
+                auto_enroll_save() {
+                    const { id, num, auto_enroll_start_date, auto_enroll_end_date, auto_enroll_receipt_title, auto_enroll_receipt_address } = this.auto_enroll.editedItem;
+
+                    if (!auto_enroll_start_date || !auto_enroll_end_date) {
+                        alert('請填寫開始與結束日期');
+                        return;
+                    }
+                    if (auto_enroll_start_date > auto_enroll_end_date) {
+                        alert('開始日期不可晚於結束日期');
+                        return;
+                    }
+
+                    // 檢查是否與其他列日期重疊
+                    const isOverlap = this.auto_enroll.items.some(item => {
+                        if (item.id === id) return false; // 跳過自己
+
+                        const existStart = item.auto_enroll_start_date;
+                        const existEnd = item.auto_enroll_end_date;
+
+                        return auto_enroll_start_date <= existEnd && auto_enroll_end_date >= existStart;
+                    });
+
+                    if (isOverlap) {
+                        alert('此報名期間與現有資料重疊，請重新確認日期');
+                        return;
+                    }
+                    
+                    var auto_enroll =
+                    {
+                        num: num,
+                        f_num: Number('<%= Request["num"] %>'),
+                        start_date: auto_enroll_start_date,
+                        end_date: auto_enroll_end_date,
+                        receipt_title: auto_enroll_receipt_title,
+                        receipt_address: auto_enroll_receipt_address,
+                    }
+
+                    this.open_confirm_dialog(auto_enroll);
+
+                    //axios.post(HTTP_HOST + 'api/follower/SaveAutoEnrollList', auto_enroll)
+                    //    .then(response => {
+                    //        const savedData = response.data;
+                    //        const updatedItem = {
+                    //            ...this.auto_enroll.editedItem,
+                    //            num: Number(savedData.num),
+                    //            id: Number(savedData.num),
+                    //            auto_enroll_start_date: savedData.start_date,
+                    //            auto_enroll_end_date: savedData.end_date,
+                    //            auto_enroll_receipt_title: savedData.receipt_title,
+                    //            auto_enroll_receipt_address: savedData.receipt_address,
+                    //        };
+                    //        this.$set(this.auto_enroll.items, this.auto_enroll.editedIndex, updatedItem);
+                    //        this.auto_enroll.editedItem = { ...this.auto_enroll.defaultItem };
+                    //        this.auto_enroll.editedIndex = -1;
+                    //    })
+                },
+                // 刪除
+                auto_enroll_delete(item) {
+                    // 先查受影響訂單
+                    axios.post(HTTP_HOST + 'api/follower/GetAffectedOrders', {
+                        num: item.num,
+                        f_num: Number('<%= Request["num"] %>'),
+                        start_date: item.auto_enroll_start_date,
+                        end_date: item.auto_enroll_end_date,
+                    }, {
+                        params: { is_delete: true }
+                    })
+                    .then(response => {
+                        this.confirm_dialog.pendingData = null;
+                        this.confirm_dialog.pendingDeleteItem = item;
+
+                        if (response.data.list.length > 0) {
+                            this.confirm_dialog.orders = response.data.list;
+                            this.confirm_dialog.title = "刪除全年報名";
+                            this.confirm_dialog.desc = "刪除後，以下已報名的活動是否一併取消？";
+                            this.confirm_dialog.btn_keep_text = "保留現有活動";
+                            this.confirm_dialog.btn_cancel_text = "取消全部活動";
+                            this.confirm_dialog.show = true;
+                        } else {
+                            this.doDelete(item);
+                        }
+                    })
+                },
+                doDelete(item) {
+                    axios.delete(HTTP_HOST + `api/follower/DeleteAutoEnroll/${item.num}`)
+                        .then(() => {
+                            const index = this.auto_enroll.items.indexOf(item);
+                            this.auto_enroll.items.splice(index, 1);
+                            this.confirm_dialog.pendingDeleteItem = null; // 清空暫存
+                        })
+                        .catch(error => {
+                            console.log("刪除失敗", error);
+                            this.snackbar.text = "刪除失敗：" + error;
+                            this.snackbar.show = true;
+                        })
+                },
+                // 顯示尚未填寫項目的活動
+                unfilled_dialog_show(item) {
+                    this.unfilled_dialog.current_item = item;
+                    this.unfilled_dialog.page = 1;
+                    this.unfilled_dialog.show = true;
+                    this.unfilled_dialog_load();
+                },
+                unfilled_dialog_load() {
+                    const item = this.unfilled_dialog.current_item;
+                    const { page, pageSize, sortBy, sortDesc } = this.unfilled_dialog;
+                    this.unfilled_dialog.loading = true;
+                    axios
+                        .get(HTTP_HOST + `api/follower/GetUnfilledActivityOrders/${item.num}`, {
+                            params: {
+                                page,
+                                pageSize,
+                                sortBy: Array.isArray(sortBy) ? sortBy[0] : sortBy,
+                                sortDesc: Array.isArray(sortDesc) ? sortDesc[0] : sortDesc
+                            }
+                        })
+                        .then(response => {
+                            this.unfilled_dialog.items = response.data.list;
+                            this.unfilled_dialog.count = response.data.count;
+                        })
+                        .finally(() => {
+                            this.unfilled_dialog.loading = false;
+                        });
+                },
+                // 列印
+                async exportUnfilledOrders() {
+                    const item = this.unfilled_dialog.current_item;
+
+                    // 取得全部資料
+                    const response = await axios.get(
+                        HTTP_HOST + `api/follower/GetUnfilledActivityOrders/${item.num}`,
+                        { params: { page: 1, pageSize: 99999 } }
+                    );
+                    const allItems = response.data.list;
+
+                    const fullTitle = this.titleword();
+                    const infoParts = fullTitle.split(' ');
+                    const followerNum = infoParts[0] || "未知編號";
+                    const followerName = infoParts[1] ? infoParts[1].split('（')[0] : "未知姓名";
+
+                    const rows = allItems.map(item => `
+                        <tr>
+                            <td>${item.order_no}</td>
+                            <td>${item.category}</td>
+                            <td>${item.activityname}</td>
+                            <td>${item.startdate?.substring(0, 10)}</td>
+                            <td>${item.enddate?.substring(0, 10)}</td>
+                        </tr>
+                    `).join('');
+
+                    const win = window.open('', '_blank');
+                    win.document.write(`
+                        <html>
+                        <head>
+                            <title>未填寫品項活動 - ${followerName}</title>
+                            <style>
+                                body { font-family: "Microsoft JhengHei", Arial, sans-serif; padding: 20px; }
+                                h2 { text-align: center; margin-bottom: 10px; }
+                                .info-header { text-align: center; margin-bottom: 20px; font-size: 16px; border-bottom: 1px solid #eee; padding-bottom: 10px; }
+                                table { width: 100%; border-collapse: collapse; }
+                                th, td { border: 1px solid #666; padding: 8px; text-align: left; }
+                                th { background-color: #f2f2f2; }
+                            </style>
+                        </head>
+                        <body>
+                            <h2>未填寫品項之活動清單</h2>
+                            <div class="info-header">
+                                信眾編號：<strong>${followerNum}</strong> &nbsp;&nbsp; 
+                                信眾姓名：<strong>${followerName}</strong>
+                            </div>
+                            <table>
+                                <thead>
+                                    <tr>
+                                        <th>報名單號</th>
+                                        <th>活動分類</th>
+                                        <th>活動名稱</th>
+                                        <th>開始日期</th>
+                                        <th>結束日期</th>
+                                    </tr>
+                                </thead>
+                                <tbody>${rows}</tbody>
+                            </table>
+                        </body>
+                        </html>
+                    `);
+                    win.document.close();
+                    win.print();
+                    win.close();
+                },
+                syncAddress() {
+                    const sourceAddr = document.getElementById('<%=address.ClientID%>').value;
+                    this.auto_enroll_config.receipt_address = sourceAddr;
+                },
+                open_confirm_dialog(auto_enroll) {
+                    if (auto_enroll.num == 0) {
+                        this.doSave(auto_enroll);
+                        return;
+                    }
+
+                    // 受影響訂單
+                    axios.post(HTTP_HOST + 'api/follower/GetAffectedOrders', auto_enroll)
+                        .then(response => {
+                            this.confirm_dialog.pendingData = auto_enroll;
+
+                            if (response.data.list.length > 0) {
+                                this.confirm_dialog.orders = response.data.list;
+                                this.confirm_dialog.title = "受影響的已報名活動";
+                                this.confirm_dialog.desc = "修改報名期間後，以下活動將不在新範圍內，是否一併取消？";
+                                this.confirm_dialog.btn_keep_text = "保留現有活動";
+                                this.confirm_dialog.btn_cancel_text = "取消全部活動";
+                                this.confirm_dialog.show = true;
+                            } else {
+                                this.doSave(auto_enroll);
+                            }
+                        })
+                },
+                doSave(auto_enroll) {
+                    axios.post(HTTP_HOST + 'api/follower/SaveAutoEnrollList', auto_enroll)
+                        .then(response => {
+                            const savedData = response.data;
+                            const updatedItem = {
+                                ...this.auto_enroll.editedItem,
+                                num: Number(savedData.num),
+                                id: Number(savedData.num),
+                                auto_enroll_start_date: savedData.start_date,
+                                auto_enroll_end_date: savedData.end_date,
+                                auto_enroll_receipt_title: savedData.receipt_title,
+                                auto_enroll_receipt_address: savedData.receipt_address,
+                            };
+                            this.$set(this.auto_enroll.items, this.auto_enroll.editedIndex, updatedItem);
+                            this.auto_enroll.editedItem = { ...this.auto_enroll.defaultItem };
+                            this.auto_enroll.editedIndex = -1;
+                            this.confirm_dialog.pendingData = null;
+                        })
+                },
+                close_confirm_dialog() {
+                    this.confirm_dialog.show = false;
+                },
+                keep_auto_enroll_order() {
+                    this.confirm_dialog.show = false;
+
+                    if (this.confirm_dialog.pendingData) {
+                        this.doSave(this.confirm_dialog.pendingData);
+                    } else if (this.confirm_dialog.pendingDeleteItem) {
+                        this.doDelete(this.confirm_dialog.pendingDeleteItem);
+                    }
+                },
+                delete_auto_enroll_order() {
+                    this.confirm_dialog.show = false;
+
+                    const orderNos = this.confirm_dialog.orders.map(o => o.order_no);
+                    if (orderNos.length === 0) return;
+                    const numsString = orderNos.join(',')
+
+                    axios.delete(HTTP_HOST + `api/order/DeleteAll/${numsString}`)
+                        .then(() => {
+                            if (this.confirm_dialog.pendingData) {
+                                this.doSave(this.confirm_dialog.pendingData);
+                            } else if (this.confirm_dialog.pendingDeleteItem) {
+                                this.doDelete(this.confirm_dialog.pendingDeleteItem);
+                            }
+                        })
+                        .catch(error => {
+                            console.log("刪除訂單失敗", error);
+                            this.snackbar.text = "刪除訂單失敗：" + error;
+                            this.snackbar.show = true;
+                        })
+                },
                 search_show(curr) {
                     console.log("btn_click:", curr, curr.api_url);
                     this.search_dialog.current = curr;
@@ -585,7 +968,7 @@
                             this.search_dialog.list = response.data.list
                             this.search_dialog.count = response.data.count
                             this.search_dialog.loading = false
-
+                            console.log(this.search_dialog.list)
                         })
                         .catch(error => {
                             console.log(error)
@@ -1318,13 +1701,32 @@
                 $('.tab-pane,.edit_Click').removeClass('pe-none'); // 移除 pe-none 類，允許編輯
             }
         });
+
+        let isComposing = false;
+        const cellphoneInput = document.querySelector('[id$="cellphone"]');
+        if (cellphoneInput) {
+            cellphoneInput.addEventListener('compositionstart', () => {
+                isComposing = true;
+            });
+            cellphoneInput.addEventListener('compositionend', (e) => {
+                isComposing = false;
+                formatCellphone(e.target);
+            });
+            cellphoneInput.addEventListener('input', (e) => {
+                if (!isComposing) {
+                    formatCellphone(e.target);
+                }
+            });
+        }
+        
+
     </script>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="page_nav" runat="Server">
     <div class="scroll-nav nav nav-tabs mb-2 mb-sm-0 d-none d-sm-flex">
          <template v-if="follower_id !='' "> {{titleword()}} </template>
     </div>
-    <div class="d-flex align-items-center">
+    <div class="">
         <div class="form-check me-3 d-none" id="editCheckboxContainer">
             <input class="form-check-input" type="checkbox" id="editCheckbox">
             <label class="form-check-label" for="editCheckbox">
@@ -1332,8 +1734,8 @@
             </label>
         </div>
         <asp:Button ID="add" runat="server" Text="送出" OnClick="add_Click" CssClass="btn btn-primary edit_Click noedit" />
-        <asp:Button ID="edit" runat="server" Text="修改" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
-        <asp:Button ID="goback" runat="server" Text="回列表" Visible="false" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
+        <asp:Button ID="edit" runat="server" Text="儲存" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
+        <asp:Button ID="goback" runat="server" Text="取消" Visible="true" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
     </div>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
@@ -1359,8 +1761,11 @@
                             type="button" role="tab" aria-controls="profile" aria-selected="false" v-if="lists.length > 0">
                             未付款紀錄 </button>
                         <button class="nav-link" id="sec2-tab4" data-bs-toggle="tab" data-bs-target="#sec2-page4"
-                            type="button" role="tab" aria-controls="profile" aria-selected="false">
+                            type="button" role="tab" aria-controls="profile" aria-selected="false" display="none">
                             牌位標題 </button>
+                        <button class="nav-link" id="sec2-tab5" data-bs-toggle="tab" data-bs-target="#sec2-page5"
+                            type="button" role="tab" aria-controls="profile" aria-selected="false">
+                            全年報名 </button>
                     </div>
                 </nav>
             </div>
@@ -1412,7 +1817,7 @@
                                 </div>
                             <label class="col-sm-2 col-lg-1 col-form-label">手機號碼<asp:Literal ID="cellphoneReqStar" runat="server" Text=" *"></asp:Literal></label>
                             <div class="col-sm-10 col-lg-3">
-                                <asp:TextBox ID="cellphone" MaxLength="12" runat="server" CssClass="form-control" data-encrypt="Y" placeholder="聯絡電話與手機號碼請至少填寫一項" oninput="formatCellphone(this)"></asp:TextBox>
+                                <asp:TextBox ID="cellphone" MaxLength="12" runat="server" CssClass="form-control" data-encrypt="Y" placeholder="聯絡電話與手機號碼請至少填寫一項"></asp:TextBox>
                                 <asp:RegularExpressionValidator ControlToValidate="cellphone" Display="Dynamic" ErrorMessage="格式有誤" ID="RegularExpressionValidator2" runat="server" SetFocusOnError="true"  ValidationExpression="^09\d{2}-?\d{3}-?\d{3}$" />
                                 </div>
                         </div>
@@ -1570,7 +1975,6 @@
                              </template>
                             </div>
                         </div>
-                        
 
                         <div class="row mb-1">
                             <label class="col-form-label">備註</label>
@@ -1959,9 +2363,176 @@
                             </v-data-table>
                        </v-card>
                     </div>
+                    <div class="tab-pane fade" id="sec2-page5" role="tabpanel" aria-labelledby="sec2-tab5" >
+                        <v-card class="mx-auto" outlined v-if="follower_id!=''">
+                            <v-data-table  class="elevation-1" fixed-header
+                                :headers="auto_enroll.headers"
+                                :items="auto_enroll.items"
+                                :search="auto_enroll.search">
+                                <v-divider inset></v-divider>
+                                <template v-slot:top>
+                                    <v-toolbar flat color="transparent" class="row ms-0">   
+                                        <div class="col-12 col-md-10 d-flex">
+                                            <v-text-field 
+                                                v-model="auto_enroll.search"
+                                                append-icon="mdi-magnify" 
+                                                label="查詢" 
+                                                dense 
+                                                outlined 
+                                                single-line 
+                                                hide-details>
+                                            </v-text-field>
+                                            <v-btn
+                                                color="primary"
+                                                class="ml-2 white--text "
+                                                title="新增全年報名"
+                                                @click="auto_enroll_add">
+                                                <v-icon dark>mdi-plus</v-icon>新增
+                                            </v-btn>
+                                        </div>
+                                    </v-toolbar>
+                                </template>
+
+                                <!-- 編輯中 -->
+                                <template v-slot:item.auto_enroll_start_date="{ item }">
+                                    <template v-if="item.id === auto_enroll.editedItem.id">
+                                        <v-text-field
+                                            v-model="auto_enroll.editedItem.auto_enroll_start_date"
+                                            type="date"
+                                            dense
+                                            hide-details
+                                            outlined>
+                                        </v-text-field>
+                                    </template>
+                                    <template v-else>
+                                        {{ item.auto_enroll_start_date }}
+                                    </template>
+                                </template>
+
+                                <template v-slot:item.auto_enroll_end_date="{ item }">
+                                    <template v-if="item.id === auto_enroll.editedItem.id">
+                                        <v-text-field
+                                            v-model="auto_enroll.editedItem.auto_enroll_end_date"
+                                            type="date"
+                                            dense
+                                            hide-details
+                                            outlined>
+                                        </v-text-field>
+                                    </template>
+                                    <template v-else>
+                                        {{ item.auto_enroll_end_date }}
+                                    </template>
+                                </template>
+
+                                <template v-slot:item.auto_enroll_receipt_title="{ item }">
+                                    <template v-if="item.id === auto_enroll.editedItem.id">
+                                        <v-text-field
+                                            v-model="auto_enroll.editedItem.auto_enroll_receipt_title"
+                                            dense
+                                            hide-details
+                                            outlined
+                                            placeholder="請輸入收據抬頭">
+                                        </v-text-field>
+                                    </template>
+                                    <template v-else>
+                                        {{ item.auto_enroll_receipt_title }}
+                                    </template>
+                                </template>
+
+                                <template v-slot:item.auto_enroll_receipt_address="{ item }">
+                                    <template v-if="item.id === auto_enroll.editedItem.id">
+                                        <v-text-field
+                                            v-model="auto_enroll.editedItem.auto_enroll_receipt_address"
+                                            dense
+                                            hide-details
+                                            outlined
+                                            placeholder="請輸入收據地址">
+                                        </v-text-field>
+                                    </template>
+                                    <template v-else>
+                                        {{ item.auto_enroll_receipt_address }}
+                                    </template>
+                                </template>
+
+                                <!-- 狀態欄位 -->
+                                <template v-slot:item.auto_enroll_status="{ item }">
+                                    <v-chip
+                                        small
+                                        :color="getEnrollStatus(item).color"
+                                        :text-color="getEnrollStatus(item).textColor"
+                                        class="font-weight-medium">
+                                        {{ getEnrollStatus(item).label }}
+                                    </v-chip>
+                                </template>
+
+                                <!-- 操作欄位 -->
+                                <template v-slot:item.actions="{ item }">  
+                                    <template v-if="item.id === auto_enroll.editedItem.id">
+                                        <v-icon color="red" class="mr-2" @click="auto_enroll_cancel">
+                                            mdi-window-close
+                                        </v-icon>
+                                        <v-icon color="green" class="mr-2" @click="auto_enroll_save">
+                                            mdi-content-save
+                                        </v-icon>
+                                    </template>
+                                    <template v-else>
+                                        <v-icon color="green" class="mr-2" @click="auto_enroll_edit(item)">
+                                            mdi-pencil
+                                        </v-icon>
+                                        <v-icon color="red" class="mr-2" @click="auto_enroll_delete(item)">
+                                            mdi-delete
+                                        </v-icon>
+                                        <v-icon color="blue" class="mr-2" @click="unfilled_dialog_show(item)" title="查看未填寫品項活動">
+                                            mdi-file-find
+                                        </v-icon>
+                                    </template>
+                                </template>
+
+                            </v-data-table>
+                        </v-card>
+
+                    </div>
                 </div>
+                
             </asp:Panel>
         </div>
+
+        <!-- 顯示沒有品項的活動 -->
+        <v-dialog v-model="unfilled_dialog.show" max-width="900px">
+            <v-card>
+                <v-card-title class="headline grey lighten-2">
+                    未填寫品項的活動
+                    <v-spacer></v-spacer>
+                    <v-btn icon @click="unfilled_dialog.show = false"><v-icon>mdi-close</v-icon></v-btn>
+                </v-card-title>
+
+                <v-card-text>
+                    <v-data-table 
+                        :headers="unfilled_dialog.headers" 
+                        :items="unfilled_dialog.items" 
+                        :footer-props="unfilled_dialog.footer"
+                        :items-per-page="unfilled_dialog.pageSize"
+                        :server-items-length="unfilled_dialog.count"
+                        :page.sync="unfilled_dialog.page"
+                         :loading="unfilled_dialog.loading"
+                        @update:page="unfilled_dialog_load"
+                        >
+                    </v-data-table>
+                </v-card-text>
+          
+                <v-card-actions class="justify-center pb-6">
+                    <v-btn 
+                        color="primary" 
+                       :disabled="unfilled_dialog.items.length == 0"
+                        class="px-4"
+                        @click="exportUnfilledOrders">
+                        <v-icon left>mdi-printer</v-icon>
+                        列印
+                    </v-btn>
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
+
         <!-- Family Member Dialog -->
         <v-dialog v-model="family.dialog" max-width="600px">
             <v-card>
@@ -2104,7 +2675,7 @@
             <v-card>
                 <v-card-title class="justify-space-between grey lighten-2">
                     查詢:{{search_dialog.current.title}}
-                    <v-btn icon @click="search_dialog.show=false"><v-icon>mdi-close</v-icon></v-btn>
+                    <v-btn icon @click="search_dialog.show=false;"><v-icon>mdi-close</v-icon></v-btn>
                 </v-card-title>
                 <v-card-text >
                     <v-row>
@@ -2154,5 +2725,47 @@
             </v-btn>
           </template>
         </v-snackbar>
+
+        <v-dialog v-model="confirm_dialog.show" max-width="500px" persistent>
+            <v-card>
+                <v-card-title class="justify-space-between grey lighten-2">
+                    <span>{{ confirm_dialog.title }}</span>
+                    <v-btn icon @click="close_confirm_dialog"><v-icon>mdi-close</v-icon></v-btn>
+                </v-card-title>
+
+                <v-card-text class="pt-4">
+                    <p class="body-1">{{ confirm_dialog.desc }}</p>
+            
+                    <v-data-table
+                        :headers="confirm_dialog.headers"
+                        :items="confirm_dialog.orders"
+                        :items-per-page="10"
+                        class="elevation-1 grey lighten-5"
+                        :footer-props="{
+                            'items-per-page-text': '每頁顯示',
+                            'items-per-page-options': [5, 10]
+                        }"
+                    >
+                        <template v-slot:item.activitydate="{ item }">
+                            <span>{{ item.activitydate }}</span>
+                        </template>
+        
+
+                    </v-data-table>
+                </v-card-text>
+                <v-divider class="pa-0 ma-0"></v-divider>
+                <v-card-actions class="pa-4 justify-end">
+                    <v-btn  color="primary"  @click="keep_auto_enroll_order">
+                        {{ confirm_dialog.btn_keep_text }}
+                    </v-btn>
+    
+                    <v-btn color="red" dark @click="delete_auto_enroll_order">
+                        {{ confirm_dialog.btn_cancel_text }}
+                    </v-btn>
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
+
     </div>
+
 </asp:Content>

web/admin/follower/reg.aspx.cs

@@ -1,34 +1,46 @@
-using System;
+using Model;
+using Newtonsoft.Json;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
+using System.Data.Entity;
 using System.Data.OleDb;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using System.Globalization;
-using Model;
+using static Model.activity_check;
 
 public partial class admin_follower_reg : MyWeb.config
 {
     private Model.ezEntities _db = new Model.ezEntities();
     public ArrayList _tmp = new ArrayList();
+    public bool isDataChanged = false;
+    public bool isAutoNumbering = ConfigurationManager.AppSettings["IsAutoNumbering"].ToString() == "true" ? true : false;
     protected void Page_Load(object sender, EventArgs e)
     {
         CallAjax();
 
         if (!IsPostBack)
-        {           
+        {
 
             InitEnumsOptions<Model.follower.type>(identity_type); //身分別
             //var qry = _db.followers.AsEnumerable();
-            var qry = _db.followers.AsQueryable();            
-            
+            var qry = _db.followers.AsQueryable();
+
             if (isStrNull(Request["num"]))
             {
+                if (!isAutoNumbering)
+                {
+                    f_number.ReadOnly = false;
+                }
+
                 if (!isStrNull(Request["leader"])) 
                 {
                     int _num = Val(Request["leader"]);
@@ -50,9 +62,14 @@ public partial class admin_follower_reg : MyWeb.config
                 //預設國籍
                 country.Value = "158";
                 country_txt.Value = "中華民國(台灣)";
+
+                // 預設加入日期
+                join_date.Text = DateTime.Now.ToString("yyyy-MM-dd");
             }
             else
             {
+                f_number.ReadOnly = true;
+
                 int _num = Val(Request["num"]);                  
                 var prod = qry.Where(q => q.num == _num).FirstOrDefault();
                 if (prod != null)
@@ -127,7 +144,7 @@ public partial class admin_follower_reg : MyWeb.config
                         country.Value = prod.country.ToString();
                     }
                     if (prod.reg_time.HasValue)
-                    {
+                    {   
                         timePanel1.Visible = true;
                         reg_time.Text= prod.reg_time.Value.ToString("yyyy/MM/dd HH:mm:ss");
                     }
@@ -138,7 +155,6 @@ public partial class admin_follower_reg : MyWeb.config
                         modify_time.Text = prod.admin_log;
                     }
 
-
                     edit.Visible = true;
                     goback.Visible = true;
                     add.Visible = false;
@@ -163,10 +179,39 @@ public partial class admin_follower_reg : MyWeb.config
         Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"]));
     }
 
-   
+
 
     #region 資料新增
+    protected string createOrderNumber()
+    {
+        Application.Lock();
+        string order_no = "AA" + DateTime.Now.ToString("yyMMdd");
 
+        var qry = _db.companies.AsQueryable();
+        //var prod = qry.Where(q => q.last_order_no.Contains(order_no)).FirstOrDefault();
+        var prod = qry.Where(q => q.num == 1).FirstOrDefault();
+        if (prod != null)
+        {
+            if (!isStrNull(prod.last_order_no) && prod.last_order_no.Contains(order_no))
+            {
+                int tmp = Convert.ToInt32(prod.last_order_no.Replace(order_no, "")) + 1;
+                order_no = order_no + tmp.ToString("0000");
+            }
+            else
+            {
+                order_no = order_no + "0001";
+            }
+
+            prod.last_order_no = order_no;
+            _db.SaveChanges();
+        }
+        else
+            order_no = "";
+
+        Application.UnLock();
+
+        return order_no;
+    }
     protected void add_Click(object sender, EventArgs e)
     {
         if (Page.IsValid) {
@@ -190,7 +235,7 @@ public partial class admin_follower_reg : MyWeb.config
                                 {
                                     ObjValue.SetValue(followers, selectDate(textBox));
                                 }
-                                else if (!isStrNull(((TextBox)obj).Attributes["data-encrypt"]) 
+                                else if (!isStrNull(((TextBox)obj).Attributes["data-encrypt"])
                                     && ValString(textBox.Attributes["data-encrypt"]).Equals("Y"))
                                 {
                                     ObjValue.SetValue(followers, encrypt.EncryptAutoKey(textBox.Text.Trim()));
@@ -206,8 +251,11 @@ public partial class admin_follower_reg : MyWeb.config
                             }
                         }
                     }
-                    // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制
-                    followers.f_number = follower.generate_f_number(sex.SelectedValue);
+                    if (isAutoNumbering)
+                    {
+                        // 使用新的 generate_f_number 方法，已內建重號檢查和重試機制
+                        followers.f_number = follower.generate_f_number(sex.SelectedValue);
+                    }
                     followers.identity_type = Val(identity_type.SelectedValue);
                     if(!isStrNull(leader.Value)) followers.leader = Val(leader.Value);
                     if (!isStrNull(country.Value)) followers.country = country.Value;
@@ -240,6 +288,8 @@ public partial class admin_follower_reg : MyWeb.config
                         Model.admin_log admin_log = new Model.admin_log();
                         admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Insert, f_number.Text + u_name.Text);
 
+                        Session["LastAddedID"] = followers.f_number;
+
                         Response.Redirect("index.aspx");
                     }
                     else
@@ -259,8 +309,8 @@ public partial class admin_follower_reg : MyWeb.config
                 L_msg.Type = alert_type.danger;
                 L_msg.Text = "信眾編號重複";
             }
-           
-        }       
+
+        }
     }
 
     #endregion
@@ -282,7 +332,7 @@ public partial class admin_follower_reg : MyWeb.config
                 try
                 {
                     foreach (Control obj in cardBodyPanel.Controls)
-                    {                            
+                    {
                         if (obj is TextBox)
                         {
                             var ObjValue = followers.GetType().GetProperty(obj.ID);
@@ -298,10 +348,7 @@ public partial class admin_follower_reg : MyWeb.config
                             }
                             else
                                 ObjValue.SetValue(followers, null);
-
                         }
-                           
-
                     }
 
                     followers.identity_type = Val(identity_type.SelectedValue);
@@ -310,22 +357,60 @@ public partial class admin_follower_reg : MyWeb.config
                     followers.sex = sex.SelectedValue;
                     followers.blood = blood.SelectedValue;
                     followers.tab = tab.Value.Trim(',');
-                    followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    //followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
                     followers.follower_hash = encrypt.followerHash(followers.phone, followers.id_code);
-                    
+
                     // 如果啟用 search_keywords 功能，生成並更新 search_keywords
                     if (GlobalVariables.UseSearchKeywords)
                     {
                         followers.search_keywords = encrypt.GenerateSearchKeywords(followers);
                     }
-                    
-                    _db.SaveChanges();
 
-                    Model.admin_log admin_log = new Model.admin_log();
-                    admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text);
+                    // 檢查是否有修改資料
+                    var entry = _db.Entry(followers);
+                    this.isDataChanged = entry.CurrentValues.PropertyNames.Any(name =>
+                    {
+                        if (name == "admin_log" || name == "follower_hash")
+                            return false;
 
-                    Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"]));
+                        var originalVal = entry.OriginalValues[name]?.ToString();
+                        var currentVal = entry.CurrentValues[name]?.ToString();
 
+                        // 針對加密欄位進行特殊處理
+                        bool isEncryptedField = (name == "phone" || name == "id_code");
+
+                        if (isEncryptedField)
+                        {
+                            string originalPlain = !string.IsNullOrEmpty(originalVal) ? encrypt.DecryptAutoKey(originalVal) : "";
+                            string currentPlain = !string.IsNullOrEmpty(currentVal) ? encrypt.DecryptAutoKey(currentVal) : "";
+                            return originalPlain.Trim() != currentPlain.Trim();
+                        }
+
+                        return !object.Equals(originalVal, currentVal);
+                    });
+
+                    if (this.isDataChanged)
+                    {
+                        followers.admin_log = admin.info.u_id + " " + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                    }
+                    else
+                    {
+                        entry.State = EntityState.Unchanged;
+                    }
+
+                    int isDataSaved = _db.SaveChanges();
+                    if (isDataSaved > 0)
+                    {
+                        //L_msg.Type = alert_type.success;
+                        //L_msg.Text = "修改成功";
+                        Model.admin_log admin_log = new Model.admin_log();
+                        admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Follower, (int)Model.admin_log.Status.Update, f_number.Text + u_name.Text);
+                        Response.Redirect("index.aspx?dirty=1&page=" + Convert.ToString(Request["page"]));
+                    }
+                    else
+                    {
+                        Response.Redirect("index.aspx?page=" + Convert.ToString(Request["page"]));
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -340,16 +425,16 @@ public partial class admin_follower_reg : MyWeb.config
                 L_msg.Text = "查無資料";
             }
             /*
-            if (chk_pro_num(f_number.Text, Val(Request["num"])))
-            {
-            }
-            else
-            {
-                L_msg.Type = alert_type.danger;
-                L_msg.Text = "信眾編號重複";
-            }
-            */
-        }    
+             if (chk_pro_num(f_number.Text, Val(Request["num"])))
+             {
+             }
+             else
+             {
+                 L_msg.Type = alert_type.danger;
+                 L_msg.Text = "信眾編號重複";
+             }
+             */
+        }
     }
 
     #endregion

web/admin/index.aspx

@@ -85,7 +85,7 @@
                             <label for="u_gauth"><i class="mdi mdi-key-variant"></i> Google Authenticator 驗證碼</label>
                         </div> 
                         <div class="mt-4 mb-0 d-grid gap-2">
-                            <asp:LinkButton ID="Button1" runat="server" OnClick="Button1_Click" 
+                            <asp:LinkButton ID="Button1" runat="server" OnClick="Button1_Click"
                                 CssClass="btn btn-primary rounded-pill">
                                 <i class="mdi mdi-login"></i> 登入</asp:LinkButton>
                             <asp:LinkButton ID="DesignModeButton" runat="server" OnClick="DesignModeButton_Click" 
@@ -105,5 +105,36 @@
         </div>
     </div>
     <!-- /.content_box -->
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        var accountInput = document.getElementById('<%= u_id.ClientID %>');
+        var passwordInput = document.getElementById('<%= u_password.ClientID %>');
+        var chkInput = document.getElementById('<%= chknum.ClientID %>');
+        var btn = document.getElementById('<%= Button1.ClientID %>');
+
+        accountInput.addEventListener('keypress', function (e){
+            if (e.keyCode === 13) {
+                $("#<%= u_password.ClientID %>").focus();
+                return false;
+            }
+        })
+
+        passwordInput.addEventListener('keypress', function (e) {
+            if (e.keyCode === 13) {
+                $("#<%= chknum.ClientID %>").focus();
+                return false;
+            }
+        })
+
+        var triggerLogin = function (e) {
+            if (e.keyCode === 13) {
+                btn.click();
+                e.preventDefault();
+                return false;
+            }
+        };
+        if (chkInput) chkInput.addEventListener('keypress', triggerLogin);
+    });
+</script>
 </asp:Content>
 

web/admin/item/TabletDesigner.aspx.cs

@@ -1,104 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Services;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-// 定義與前端一致的元素結構
-public class TabletElement
-{
-    public string id { get; set; }
-    public string type { get; set; }
-    public string text { get; set; }
-    public double x { get; set; }
-    public double y { get; set; }
-    public double? width { get; set; }
-    public double? height { get; set; }
-    public ElementStyle style { get; set; }
-    public string hidden { get; set; }
-    public double? twoOffset { get; set; }
-    public double? threeOffset { get; set; }
-    public double? fourOffset { get; set; }
-    public int? breakLen { get; set; }
-    public string backendInp { get; set; }
-    public double? textWidth { get; set; }
-    public double? textHeight { get; set; }
- 
-}
-
-public class ElementStyle
-{
-    public double fontSize { get; set; }
-    public string fontFamily { get; set; }
-    public bool isVertical { get; set; }
-    public double letterSpacing { get; set; }
-    public double lineHeight { get; set; }
-    public double? itemSpacing { get; set; }
-    public string visibility { get; set; }
-}
-
-public partial class admin_item_TabletDesigner :MyWeb.config
-{
-
-    protected void Page_Load(object sender, EventArgs e)
-    {
-
-    }
-    [WebMethod]
-    public static string SaveDesigner()
-    {
-
-        return "";
-    }
-    [WebMethod]
-    public static string GetConfig()
-    {
-        // 模擬原本的 GetConfig() 行為
-        var config = new
-        {
-            elements = new List<TabletElement> {
-                new TabletElement {
-                    id = "address", type = "address", text = "台中市潭子區中山路", x = 60, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5,visibility="" }
-                },
-                new TabletElement {
-                    id = "title1", type = "ancestor", text = "張一\n李二\n陳三\n吳四\n劉五\n趙六\n林七\n徐八", x = 50, y = 80,
-                     width=136,height=600,textWidth=20,textHeight=90,
-                    style = new ElementStyle { fontSize = 16, fontFamily = "Kaiti", isVertical = true, letterSpacing = 1, lineHeight = 1 ,visibility="" }
-                },
-                new TabletElement {
-                    id = "lefttitle", type = "ancestor", text = "左正名", x = 10, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
-                },
-                new TabletElement {
-                    id = "righttitle", type = "ancestor", text = "右正名", x = 50, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
-                },
-                new TabletElement {
-                    id = "titletriangle", type = "roster", text = "張一\n李二\n陳三\n吳四\n劉五\n趙六\n林七\n徐八", x = 10, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5,visibility=""  }
-                },
-                new TabletElement
-                {
-                    id="tricombined",type="combined-center",text="林張吳\n氏歷代祖先", x = 10, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
-                },
-                new TabletElement
-                {
-                    id="combined",type="combined-center",text="李王\n氏歷代祖先", x = 10, y = 80,
-                    style = new ElementStyle { fontSize = 24, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
-                },
-                new TabletElement
-                {
-                    id="alive",type="alive",text="陽上名字", x = 60, y = 200,
-                    style = new ElementStyle { fontSize = 18, fontFamily = "Kaiti", isVertical = true, letterSpacing = 5, lineHeight = 1.5 ,visibility="" }
-                }
-            },
-            paper = new { width = 100, height = 272, name = "Yellow" }
-        };
-        return JsonConvert.SerializeObject(config);
-    }
-}

web/admin/item/bootstrap/css/bootstrap-reboot.css

@@ -1,601 +0,0 @@
-/*!
- * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
- * Copyright 2011-2025 The Bootstrap Authors
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- */
-:root,
-[data-bs-theme=light] {
-  --bs-blue: #0d6efd;
-  --bs-indigo: #6610f2;
-  --bs-purple: #6f42c1;
-  --bs-pink: #d63384;
-  --bs-red: #dc3545;
-  --bs-orange: #fd7e14;
-  --bs-yellow: #ffc107;
-  --bs-green: #198754;
-  --bs-teal: #20c997;
-  --bs-cyan: #0dcaf0;
-  --bs-black: #000;
-  --bs-white: #fff;
-  --bs-gray: #6c757d;
-  --bs-gray-dark: #343a40;
-  --bs-gray-100: #f8f9fa;
-  --bs-gray-200: #e9ecef;
-  --bs-gray-300: #dee2e6;
-  --bs-gray-400: #ced4da;
-  --bs-gray-500: #adb5bd;
-  --bs-gray-600: #6c757d;
-  --bs-gray-700: #495057;
-  --bs-gray-800: #343a40;
-  --bs-gray-900: #212529;
-  --bs-primary: #0d6efd;
-  --bs-secondary: #6c757d;
-  --bs-success: #198754;
-  --bs-info: #0dcaf0;
-  --bs-warning: #ffc107;
-  --bs-danger: #dc3545;
-  --bs-light: #f8f9fa;
-  --bs-dark: #212529;
-  --bs-primary-rgb: 13, 110, 253;
-  --bs-secondary-rgb: 108, 117, 125;
-  --bs-success-rgb: 25, 135, 84;
-  --bs-info-rgb: 13, 202, 240;
-  --bs-warning-rgb: 255, 193, 7;
-  --bs-danger-rgb: 220, 53, 69;
-  --bs-light-rgb: 248, 249, 250;
-  --bs-dark-rgb: 33, 37, 41;
-  --bs-primary-text-emphasis: #052c65;
-  --bs-secondary-text-emphasis: #2b2f32;
-  --bs-success-text-emphasis: #0a3622;
-  --bs-info-text-emphasis: #055160;
-  --bs-warning-text-emphasis: #664d03;
-  --bs-danger-text-emphasis: #58151c;
-  --bs-light-text-emphasis: #495057;
-  --bs-dark-text-emphasis: #495057;
-  --bs-primary-bg-subtle: #cfe2ff;
-  --bs-secondary-bg-subtle: #e2e3e5;
-  --bs-success-bg-subtle: #d1e7dd;
-  --bs-info-bg-subtle: #cff4fc;
-  --bs-warning-bg-subtle: #fff3cd;
-  --bs-danger-bg-subtle: #f8d7da;
-  --bs-light-bg-subtle: #fcfcfd;
-  --bs-dark-bg-subtle: #ced4da;
-  --bs-primary-border-subtle: #9ec5fe;
-  --bs-secondary-border-subtle: #c4c8cb;
-  --bs-success-border-subtle: #a3cfbb;
-  --bs-info-border-subtle: #9eeaf9;
-  --bs-warning-border-subtle: #ffe69c;
-  --bs-danger-border-subtle: #f1aeb5;
-  --bs-light-border-subtle: #e9ecef;
-  --bs-dark-border-subtle: #adb5bd;
-  --bs-white-rgb: 255, 255, 255;
-  --bs-black-rgb: 0, 0, 0;
-  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
-  --bs-body-font-family: var(--bs-font-sans-serif);
-  --bs-body-font-size: 1rem;
-  --bs-body-font-weight: 400;
-  --bs-body-line-height: 1.5;
-  --bs-body-color: #212529;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg: #fff;
-  --bs-body-bg-rgb: 255, 255, 255;
-  --bs-emphasis-color: #000;
-  --bs-emphasis-color-rgb: 0, 0, 0;
-  --bs-secondary-color: rgba(33, 37, 41, 0.75);
-  --bs-secondary-color-rgb: 33, 37, 41;
-  --bs-secondary-bg: #e9ecef;
-  --bs-secondary-bg-rgb: 233, 236, 239;
-  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
-  --bs-tertiary-color-rgb: 33, 37, 41;
-  --bs-tertiary-bg: #f8f9fa;
-  --bs-tertiary-bg-rgb: 248, 249, 250;
-  --bs-heading-color: inherit;
-  --bs-link-color: #0d6efd;
-  --bs-link-color-rgb: 13, 110, 253;
-  --bs-link-decoration: underline;
-  --bs-link-hover-color: #0a58ca;
-  --bs-link-hover-color-rgb: 10, 88, 202;
-  --bs-code-color: #d63384;
-  --bs-highlight-color: #212529;
-  --bs-highlight-bg: #fff3cd;
-  --bs-border-width: 1px;
-  --bs-border-style: solid;
-  --bs-border-color: #dee2e6;
-  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
-  --bs-border-radius: 0.375rem;
-  --bs-border-radius-sm: 0.25rem;
-  --bs-border-radius-lg: 0.5rem;
-  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-xxl: 2rem;
-  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
-  --bs-border-radius-pill: 50rem;
-  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
-  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
-  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
-  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
-  --bs-focus-ring-width: 0.25rem;
-  --bs-focus-ring-opacity: 0.25;
-  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
-  --bs-form-valid-color: #198754;
-  --bs-form-valid-border-color: #198754;
-  --bs-form-invalid-color: #dc3545;
-  --bs-form-invalid-border-color: #dc3545;
-}
-
-[data-bs-theme=dark] {
-  color-scheme: dark;
-  --bs-body-color: #dee2e6;
-  --bs-body-color-rgb: 222, 226, 230;
-  --bs-body-bg: #212529;
-  --bs-body-bg-rgb: 33, 37, 41;
-  --bs-emphasis-color: #fff;
-  --bs-emphasis-color-rgb: 255, 255, 255;
-  --bs-secondary-color: rgba(222, 226, 230, 0.75);
-  --bs-secondary-color-rgb: 222, 226, 230;
-  --bs-secondary-bg: #343a40;
-  --bs-secondary-bg-rgb: 52, 58, 64;
-  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
-  --bs-tertiary-color-rgb: 222, 226, 230;
-  --bs-tertiary-bg: #2b3035;
-  --bs-tertiary-bg-rgb: 43, 48, 53;
-  --bs-primary-text-emphasis: #6ea8fe;
-  --bs-secondary-text-emphasis: #a7acb1;
-  --bs-success-text-emphasis: #75b798;
-  --bs-info-text-emphasis: #6edff6;
-  --bs-warning-text-emphasis: #ffda6a;
-  --bs-danger-text-emphasis: #ea868f;
-  --bs-light-text-emphasis: #f8f9fa;
-  --bs-dark-text-emphasis: #dee2e6;
-  --bs-primary-bg-subtle: #031633;
-  --bs-secondary-bg-subtle: #161719;
-  --bs-success-bg-subtle: #051b11;
-  --bs-info-bg-subtle: #032830;
-  --bs-warning-bg-subtle: #332701;
-  --bs-danger-bg-subtle: #2c0b0e;
-  --bs-light-bg-subtle: #343a40;
-  --bs-dark-bg-subtle: #1a1d20;
-  --bs-primary-border-subtle: #084298;
-  --bs-secondary-border-subtle: #41464b;
-  --bs-success-border-subtle: #0f5132;
-  --bs-info-border-subtle: #087990;
-  --bs-warning-border-subtle: #997404;
-  --bs-danger-border-subtle: #842029;
-  --bs-light-border-subtle: #495057;
-  --bs-dark-border-subtle: #343a40;
-  --bs-heading-color: inherit;
-  --bs-link-color: #6ea8fe;
-  --bs-link-hover-color: #8bb9fe;
-  --bs-link-color-rgb: 110, 168, 254;
-  --bs-link-hover-color-rgb: 139, 185, 254;
-  --bs-code-color: #e685b5;
-  --bs-highlight-color: #dee2e6;
-  --bs-highlight-bg: #664d03;
-  --bs-border-color: #495057;
-  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
-  --bs-form-valid-color: #75b798;
-  --bs-form-valid-border-color: #75b798;
-  --bs-form-invalid-color: #ea868f;
-  --bs-form-invalid-border-color: #ea868f;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  :root {
-    scroll-behavior: smooth;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: var(--bs-body-font-family);
-  font-size: var(--bs-body-font-size);
-  font-weight: var(--bs-body-font-weight);
-  line-height: var(--bs-body-line-height);
-  color: var(--bs-body-color);
-  text-align: var(--bs-body-text-align);
-  background-color: var(--bs-body-bg);
-  -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-hr {
-  margin: 1rem 0;
-  color: inherit;
-  border: 0;
-  border-top: var(--bs-border-width) solid;
-  opacity: 0.25;
-}
-
-h6, h5, h4, h3, h2, h1 {
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-  font-weight: 500;
-  line-height: 1.2;
-  color: var(--bs-heading-color);
-}
-
-h1 {
-  font-size: calc(1.375rem + 1.5vw);
-}
-@media (min-width: 1200px) {
-  h1 {
-    font-size: 2.5rem;
-  }
-}
-
-h2 {
-  font-size: calc(1.325rem + 0.9vw);
-}
-@media (min-width: 1200px) {
-  h2 {
-    font-size: 2rem;
-  }
-}
-
-h3 {
-  font-size: calc(1.3rem + 0.6vw);
-}
-@media (min-width: 1200px) {
-  h3 {
-    font-size: 1.75rem;
-  }
-}
-
-h4 {
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  h4 {
-    font-size: 1.5rem;
-  }
-}
-
-h5 {
-  font-size: 1.25rem;
-}
-
-h6 {
-  font-size: 1rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title] {
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-  cursor: help;
-  -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul {
-  padding-left: 2rem;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: 700;
-}
-
-dd {
-  margin-bottom: 0.5rem;
-  margin-left: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 0.875em;
-}
-
-mark {
-  padding: 0.1875em;
-  color: var(--bs-highlight-color);
-  background-color: var(--bs-highlight-bg);
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 0.75em;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-a {
-  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
-  text-decoration: underline;
-}
-a:hover {
-  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
-}
-
-a:not([href]):not([class]), a:not([href]):not([class]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: var(--bs-font-monospace);
-  font-size: 1em;
-}
-
-pre {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-  font-size: 0.875em;
-}
-pre code {
-  font-size: inherit;
-  color: inherit;
-  word-break: normal;
-}
-
-code {
-  font-size: 0.875em;
-  color: var(--bs-code-color);
-  word-wrap: break-word;
-}
-a > code {
-  color: inherit;
-}
-
-kbd {
-  padding: 0.1875rem 0.375rem;
-  font-size: 0.875em;
-  color: var(--bs-body-bg);
-  background-color: var(--bs-body-color);
-  border-radius: 0.25rem;
-}
-kbd kbd {
-  padding: 0;
-  font-size: 1em;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img,
-svg {
-  vertical-align: middle;
-}
-
-table {
-  caption-side: bottom;
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  color: var(--bs-secondary-color);
-  text-align: left;
-}
-
-th {
-  text-align: inherit;
-  text-align: -webkit-match-parent;
-}
-
-thead,
-tbody,
-tfoot,
-tr,
-td,
-th {
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-}
-
-label {
-  display: inline-block;
-}
-
-button {
-  border-radius: 0;
-}
-
-button:focus:not(:focus-visible) {
-  outline: 0;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-[role=button] {
-  cursor: pointer;
-}
-
-select {
-  word-wrap: normal;
-}
-select:disabled {
-  opacity: 1;
-}
-
-[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
-  display: none !important;
-}
-
-button,
-[type=button],
-[type=reset],
-[type=submit] {
-  -webkit-appearance: button;
-}
-button:not(:disabled),
-[type=button]:not(:disabled),
-[type=reset]:not(:disabled),
-[type=submit]:not(:disabled) {
-  cursor: pointer;
-}
-
-::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-textarea {
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  float: left;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 0.5rem;
-  line-height: inherit;
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  legend {
-    font-size: 1.5rem;
-  }
-}
-legend + * {
-  clear: left;
-}
-
-::-webkit-datetime-edit-fields-wrapper,
-::-webkit-datetime-edit-text,
-::-webkit-datetime-edit-minute,
-::-webkit-datetime-edit-hour-field,
-::-webkit-datetime-edit-day-field,
-::-webkit-datetime-edit-month-field,
-::-webkit-datetime-edit-year-field {
-  padding: 0;
-}
-
-::-webkit-inner-spin-button {
-  height: auto;
-}
-
-[type=search] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px;
-}
-[type=search]::-webkit-search-cancel-button {
-  cursor: pointer;
-  filter: grayscale(1);
-}
-
-/* rtl:raw:
-[type="tel"],
-[type="url"],
-[type="email"],
-[type="number"] {
-  direction: ltr;
-}
-*/
-::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-color-swatch-wrapper {
-  padding: 0;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-::file-selector-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-iframe {
-  border: 0;
-}
-
-summary {
-  display: list-item;
-  cursor: pointer;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[hidden] {
-  display: none !important;
-}
-
-/*# sourceMappingURL=bootstrap-reboot.css.map */

web/admin/item/bootstrap/css/bootstrap-reboot.rtl.css

@@ -1,598 +0,0 @@
-/*!
- * Bootstrap Reboot v5.3.8 (https://getbootstrap.com/)
- * Copyright 2011-2025 The Bootstrap Authors
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- */
-:root,
-[data-bs-theme=light] {
-  --bs-blue: #0d6efd;
-  --bs-indigo: #6610f2;
-  --bs-purple: #6f42c1;
-  --bs-pink: #d63384;
-  --bs-red: #dc3545;
-  --bs-orange: #fd7e14;
-  --bs-yellow: #ffc107;
-  --bs-green: #198754;
-  --bs-teal: #20c997;
-  --bs-cyan: #0dcaf0;
-  --bs-black: #000;
-  --bs-white: #fff;
-  --bs-gray: #6c757d;
-  --bs-gray-dark: #343a40;
-  --bs-gray-100: #f8f9fa;
-  --bs-gray-200: #e9ecef;
-  --bs-gray-300: #dee2e6;
-  --bs-gray-400: #ced4da;
-  --bs-gray-500: #adb5bd;
-  --bs-gray-600: #6c757d;
-  --bs-gray-700: #495057;
-  --bs-gray-800: #343a40;
-  --bs-gray-900: #212529;
-  --bs-primary: #0d6efd;
-  --bs-secondary: #6c757d;
-  --bs-success: #198754;
-  --bs-info: #0dcaf0;
-  --bs-warning: #ffc107;
-  --bs-danger: #dc3545;
-  --bs-light: #f8f9fa;
-  --bs-dark: #212529;
-  --bs-primary-rgb: 13, 110, 253;
-  --bs-secondary-rgb: 108, 117, 125;
-  --bs-success-rgb: 25, 135, 84;
-  --bs-info-rgb: 13, 202, 240;
-  --bs-warning-rgb: 255, 193, 7;
-  --bs-danger-rgb: 220, 53, 69;
-  --bs-light-rgb: 248, 249, 250;
-  --bs-dark-rgb: 33, 37, 41;
-  --bs-primary-text-emphasis: #052c65;
-  --bs-secondary-text-emphasis: #2b2f32;
-  --bs-success-text-emphasis: #0a3622;
-  --bs-info-text-emphasis: #055160;
-  --bs-warning-text-emphasis: #664d03;
-  --bs-danger-text-emphasis: #58151c;
-  --bs-light-text-emphasis: #495057;
-  --bs-dark-text-emphasis: #495057;
-  --bs-primary-bg-subtle: #cfe2ff;
-  --bs-secondary-bg-subtle: #e2e3e5;
-  --bs-success-bg-subtle: #d1e7dd;
-  --bs-info-bg-subtle: #cff4fc;
-  --bs-warning-bg-subtle: #fff3cd;
-  --bs-danger-bg-subtle: #f8d7da;
-  --bs-light-bg-subtle: #fcfcfd;
-  --bs-dark-bg-subtle: #ced4da;
-  --bs-primary-border-subtle: #9ec5fe;
-  --bs-secondary-border-subtle: #c4c8cb;
-  --bs-success-border-subtle: #a3cfbb;
-  --bs-info-border-subtle: #9eeaf9;
-  --bs-warning-border-subtle: #ffe69c;
-  --bs-danger-border-subtle: #f1aeb5;
-  --bs-light-border-subtle: #e9ecef;
-  --bs-dark-border-subtle: #adb5bd;
-  --bs-white-rgb: 255, 255, 255;
-  --bs-black-rgb: 0, 0, 0;
-  --bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
-  --bs-body-font-family: var(--bs-font-sans-serif);
-  --bs-body-font-size: 1rem;
-  --bs-body-font-weight: 400;
-  --bs-body-line-height: 1.5;
-  --bs-body-color: #212529;
-  --bs-body-color-rgb: 33, 37, 41;
-  --bs-body-bg: #fff;
-  --bs-body-bg-rgb: 255, 255, 255;
-  --bs-emphasis-color: #000;
-  --bs-emphasis-color-rgb: 0, 0, 0;
-  --bs-secondary-color: rgba(33, 37, 41, 0.75);
-  --bs-secondary-color-rgb: 33, 37, 41;
-  --bs-secondary-bg: #e9ecef;
-  --bs-secondary-bg-rgb: 233, 236, 239;
-  --bs-tertiary-color: rgba(33, 37, 41, 0.5);
-  --bs-tertiary-color-rgb: 33, 37, 41;
-  --bs-tertiary-bg: #f8f9fa;
-  --bs-tertiary-bg-rgb: 248, 249, 250;
-  --bs-heading-color: inherit;
-  --bs-link-color: #0d6efd;
-  --bs-link-color-rgb: 13, 110, 253;
-  --bs-link-decoration: underline;
-  --bs-link-hover-color: #0a58ca;
-  --bs-link-hover-color-rgb: 10, 88, 202;
-  --bs-code-color: #d63384;
-  --bs-highlight-color: #212529;
-  --bs-highlight-bg: #fff3cd;
-  --bs-border-width: 1px;
-  --bs-border-style: solid;
-  --bs-border-color: #dee2e6;
-  --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
-  --bs-border-radius: 0.375rem;
-  --bs-border-radius-sm: 0.25rem;
-  --bs-border-radius-lg: 0.5rem;
-  --bs-border-radius-xl: 1rem;
-  --bs-border-radius-xxl: 2rem;
-  --bs-border-radius-2xl: var(--bs-border-radius-xxl);
-  --bs-border-radius-pill: 50rem;
-  --bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
-  --bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
-  --bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
-  --bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
-  --bs-focus-ring-width: 0.25rem;
-  --bs-focus-ring-opacity: 0.25;
-  --bs-focus-ring-color: rgba(13, 110, 253, 0.25);
-  --bs-form-valid-color: #198754;
-  --bs-form-valid-border-color: #198754;
-  --bs-form-invalid-color: #dc3545;
-  --bs-form-invalid-border-color: #dc3545;
-}
-
-[data-bs-theme=dark] {
-  color-scheme: dark;
-  --bs-body-color: #dee2e6;
-  --bs-body-color-rgb: 222, 226, 230;
-  --bs-body-bg: #212529;
-  --bs-body-bg-rgb: 33, 37, 41;
-  --bs-emphasis-color: #fff;
-  --bs-emphasis-color-rgb: 255, 255, 255;
-  --bs-secondary-color: rgba(222, 226, 230, 0.75);
-  --bs-secondary-color-rgb: 222, 226, 230;
-  --bs-secondary-bg: #343a40;
-  --bs-secondary-bg-rgb: 52, 58, 64;
-  --bs-tertiary-color: rgba(222, 226, 230, 0.5);
-  --bs-tertiary-color-rgb: 222, 226, 230;
-  --bs-tertiary-bg: #2b3035;
-  --bs-tertiary-bg-rgb: 43, 48, 53;
-  --bs-primary-text-emphasis: #6ea8fe;
-  --bs-secondary-text-emphasis: #a7acb1;
-  --bs-success-text-emphasis: #75b798;
-  --bs-info-text-emphasis: #6edff6;
-  --bs-warning-text-emphasis: #ffda6a;
-  --bs-danger-text-emphasis: #ea868f;
-  --bs-light-text-emphasis: #f8f9fa;
-  --bs-dark-text-emphasis: #dee2e6;
-  --bs-primary-bg-subtle: #031633;
-  --bs-secondary-bg-subtle: #161719;
-  --bs-success-bg-subtle: #051b11;
-  --bs-info-bg-subtle: #032830;
-  --bs-warning-bg-subtle: #332701;
-  --bs-danger-bg-subtle: #2c0b0e;
-  --bs-light-bg-subtle: #343a40;
-  --bs-dark-bg-subtle: #1a1d20;
-  --bs-primary-border-subtle: #084298;
-  --bs-secondary-border-subtle: #41464b;
-  --bs-success-border-subtle: #0f5132;
-  --bs-info-border-subtle: #087990;
-  --bs-warning-border-subtle: #997404;
-  --bs-danger-border-subtle: #842029;
-  --bs-light-border-subtle: #495057;
-  --bs-dark-border-subtle: #343a40;
-  --bs-heading-color: inherit;
-  --bs-link-color: #6ea8fe;
-  --bs-link-hover-color: #8bb9fe;
-  --bs-link-color-rgb: 110, 168, 254;
-  --bs-link-hover-color-rgb: 139, 185, 254;
-  --bs-code-color: #e685b5;
-  --bs-highlight-color: #dee2e6;
-  --bs-highlight-bg: #664d03;
-  --bs-border-color: #495057;
-  --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
-  --bs-form-valid-color: #75b798;
-  --bs-form-valid-border-color: #75b798;
-  --bs-form-invalid-color: #ea868f;
-  --bs-form-invalid-border-color: #ea868f;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  :root {
-    scroll-behavior: smooth;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: var(--bs-body-font-family);
-  font-size: var(--bs-body-font-size);
-  font-weight: var(--bs-body-font-weight);
-  line-height: var(--bs-body-line-height);
-  color: var(--bs-body-color);
-  text-align: var(--bs-body-text-align);
-  background-color: var(--bs-body-bg);
-  -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-hr {
-  margin: 1rem 0;
-  color: inherit;
-  border: 0;
-  border-top: var(--bs-border-width) solid;
-  opacity: 0.25;
-}
-
-h6, h5, h4, h3, h2, h1 {
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-  font-weight: 500;
-  line-height: 1.2;
-  color: var(--bs-heading-color);
-}
-
-h1 {
-  font-size: calc(1.375rem + 1.5vw);
-}
-@media (min-width: 1200px) {
-  h1 {
-    font-size: 2.5rem;
-  }
-}
-
-h2 {
-  font-size: calc(1.325rem + 0.9vw);
-}
-@media (min-width: 1200px) {
-  h2 {
-    font-size: 2rem;
-  }
-}
-
-h3 {
-  font-size: calc(1.3rem + 0.6vw);
-}
-@media (min-width: 1200px) {
-  h3 {
-    font-size: 1.75rem;
-  }
-}
-
-h4 {
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  h4 {
-    font-size: 1.5rem;
-  }
-}
-
-h5 {
-  font-size: 1.25rem;
-}
-
-h6 {
-  font-size: 1rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title] {
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-  cursor: help;
-  -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul {
-  padding-right: 2rem;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: 700;
-}
-
-dd {
-  margin-bottom: 0.5rem;
-  margin-right: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 0.875em;
-}
-
-mark {
-  padding: 0.1875em;
-  color: var(--bs-highlight-color);
-  background-color: var(--bs-highlight-bg);
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 0.75em;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-a {
-  color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
-  text-decoration: underline;
-}
-a:hover {
-  --bs-link-color-rgb: var(--bs-link-hover-color-rgb);
-}
-
-a:not([href]):not([class]), a:not([href]):not([class]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: var(--bs-font-monospace);
-  font-size: 1em;
-}
-
-pre {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-  font-size: 0.875em;
-}
-pre code {
-  font-size: inherit;
-  color: inherit;
-  word-break: normal;
-}
-
-code {
-  font-size: 0.875em;
-  color: var(--bs-code-color);
-  word-wrap: break-word;
-}
-a > code {
-  color: inherit;
-}
-
-kbd {
-  padding: 0.1875rem 0.375rem;
-  font-size: 0.875em;
-  color: var(--bs-body-bg);
-  background-color: var(--bs-body-color);
-  border-radius: 0.25rem;
-}
-kbd kbd {
-  padding: 0;
-  font-size: 1em;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img,
-svg {
-  vertical-align: middle;
-}
-
-table {
-  caption-side: bottom;
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  color: var(--bs-secondary-color);
-  text-align: right;
-}
-
-th {
-  text-align: inherit;
-  text-align: -webkit-match-parent;
-}
-
-thead,
-tbody,
-tfoot,
-tr,
-td,
-th {
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-}
-
-label {
-  display: inline-block;
-}
-
-button {
-  border-radius: 0;
-}
-
-button:focus:not(:focus-visible) {
-  outline: 0;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-[role=button] {
-  cursor: pointer;
-}
-
-select {
-  word-wrap: normal;
-}
-select:disabled {
-  opacity: 1;
-}
-
-[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
-  display: none !important;
-}
-
-button,
-[type=button],
-[type=reset],
-[type=submit] {
-  -webkit-appearance: button;
-}
-button:not(:disabled),
-[type=button]:not(:disabled),
-[type=reset]:not(:disabled),
-[type=submit]:not(:disabled) {
-  cursor: pointer;
-}
-
-::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-textarea {
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  float: right;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 0.5rem;
-  line-height: inherit;
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  legend {
-    font-size: 1.5rem;
-  }
-}
-legend + * {
-  clear: right;
-}
-
-::-webkit-datetime-edit-fields-wrapper,
-::-webkit-datetime-edit-text,
-::-webkit-datetime-edit-minute,
-::-webkit-datetime-edit-hour-field,
-::-webkit-datetime-edit-day-field,
-::-webkit-datetime-edit-month-field,
-::-webkit-datetime-edit-year-field {
-  padding: 0;
-}
-
-::-webkit-inner-spin-button {
-  height: auto;
-}
-
-[type=search] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px;
-}
-[type=search]::-webkit-search-cancel-button {
-  cursor: pointer;
-  filter: grayscale(1);
-}
-
-[type="tel"],
-[type="url"],
-[type="email"],
-[type="number"] {
-  direction: ltr;
-}
-::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-color-swatch-wrapper {
-  padding: 0;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-::file-selector-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-iframe {
-  border: 0;
-}
-
-summary {
-  display: list-item;
-  cursor: pointer;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[hidden] {
-  display: none !important;
-}
-/*# sourceMappingURL=bootstrap-reboot.rtl.css.map */

web/admin/item/css/floating.css

@@ -1,6 +0,0 @@
-.floating-box{
-    position:fixed;
-    width:260px;
-    z-index:9999;
-    max-height:calc(100vh-100px);
-}

web/admin/item/css/styles.css

@@ -1,61 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
-
-/*@import "bootstrap/scss/bootstrap";
-@import "bootstrap-icons/font/bootstrap-icons";*/
-
-// 3. 自定義全域樣式 (讓 Sidebar 滿版)
-html, body {
-  height: 100%;
-  // 修正捲軸在 Dark mode 的顏色
-  &[data-bs-theme="dark"] {
-    color-scheme: dark;
-  }
-}
-
-// Sidebar 固定寬度設定 (可依需求調整)
-.sidebar {
-  width: 250px;
-  min-height: 100vh;
-  transition: all 0.3s;
-
-  @include media-breakpoint-down(md) {
-    width: 100%; // 手機版變成全寬或隱藏
-    min-height: auto;
-  }
-}
-
-.main-content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow-y: auto; // 內容區域獨立捲動
-}
-
-input[type="checkbox"]{
-
-  /* 1. Remove native styles */
-  -webkit-appearance: none;
-  appearance: none;
-
-  width: 25px !important;
-  height: 25px !important;
-
-  border: 2px solid #555; /* Your custom border */
-  border-radius: 4px;      /* Optional: rounded corners */
-  outline: none;
-  cursor: pointer;
-
-  /* Layout for the checkmark */
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  margin-right: 8px;
-  vertical-align: middle;
-  background-color: white;
-  transition: all 0.2s ease;
-}
-
-$toast-max-width: 500px;
-$toast-font-size: 1.5rem;
-

web/admin/item/css/tablet-design.css

@@ -1,250 +0,0 @@
-:host {
-  display: block;
-  width: auto;
-  height: auto;
-  --canvas-bg: #f8f9fa;
-  --canvas-grid: #dee2e6;
-  --paper-bg: #fffbf0;
-  --paper-shadow: rgba(0,0,0,0.1);
-  --selection-color: #0d6efd;
-}
-
-:host-context([data-bs-theme="dark"]) {
-  --canvas-bg: #0f1114;
-  --canvas-grid: #2b3035;
-  --paper-shadow: rgba(0,0,0,0.8);
-  /* 紙張保持米黃，因為它是實物模擬 */
-}
-
-/*.yangshang-wrapper {
-    display: flex !important;
-    flex-direction: row !important;*/ /* 垂直堆疊 */
-    /*justify-content: space-between !important;*/ /* 陽上與拜薦各據頂底 */
-    /*align-items: center !important;*/ /* 水平方向置中 */
-    /*height: 100% !important;
-    width: 100% !important;
-    writing-mode: vertical-rl !important;*/ /* 確保內部文字均為垂直書寫 */
-    /*text-orientation: upright !important;*/ /* 確保文字方向轉正 */
-    /*gap: 1px;
-}*/
-
-.designer-root {
-  /* 防止瀏覽器預設捲動影響畫布 */
-  overflow: hidden;
-}
-
-.canvas-area {
-    background-color: var(--canvas-bg);
-    background-image: linear-gradient(45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(-45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(45deg, transparent 75%, var(--canvas-grid) 75%), linear-gradient(-45deg, transparent 75%, var(--canvas-grid) 75%);
-    background-size: 20px 20px;
-    transition: background-color 0.3s;
-/*    min-height: 100vw;*/
-   
-}
-
-.tablet-paper {
-  background-color: var(--paper-bg);
-  box-shadow: 0 10px 30px var(--paper-shadow);
-  transition: all 0.3s;
-  overflow: hidden;
-  /* 確保在列印時被視為一個分頁單元 */
-  page-break-inside: avoid;
-}
-
-.tablet-element {
-  cursor: move;
-  padding: 4px;
-  color: black !important; /* 強制墨水為黑色 */
-  border: 1px solid transparent;
-  transition: writing-mode 0.3s, transform 0.2s;
-}
-.tablet-element:hover { border-color: rgba(13, 110, 253, 0.3); }
-
-
-/* 直書模式核心 */
-.vertical-text {
-  writing-mode: vertical-rl;
-  text-orientation: mixed; /* 這是關鍵：中文直立，英文轉90度 */
-  white-space: pre-wrap;
-}
-
-/* 縱中橫 (讓直書中的數字變成橫向) */
-.tate-chu-yoko {
-  text-combine-upright: all; /* 擠在一起 */
-  /* 或者使用 digits 4 (但在某些瀏覽器支援度不一，all 比較保險) */
-  display: inline-block;
-  letter-spacing: 0; /* 數字之間不要有間距 */
-}
-
-/* 名單金字塔佈局容器 */
-.roster-container {
-  width: 100%; height: 600px;
-  writing-mode: vertical-rl; /* 直書 */
-  display: flex;
-  /*flex-direction: column;*/ /* 雖然是直書，但物理上我們是將「上層區」和「下層區」垂直堆疊 */
-  flex-direction: row;     /* 上下分層 (Top / Bottom) */
-  align-items: center;    /* 左右置中對齊 */
-  justify-content: center;
-  gap: 20px;               /* 這是「上層」跟「下層」之間的距離，可以設大一點 */
-}
-
-.roster-row {
-  display: flex;
-  flex-direction: row-reverse; /* 直書由右至左，所以 Row 要反向或依需求調整 */
-  justify-content: center;
-  gap: 8px; /* 名字之間的間距 */
-  margin-left: 10px; /* 上下排之間的間距 (因為是直書，margin-left 是物理上的左邊/下方) */
-}
-
-.name-group {
-  display: flex;
-  flex-direction: column;  /* ★★★ 關鍵：這讓名字左右並排 ★★★ */
-  justify-content: center;
-  align-items: center;
-  /* gap 由 HTML 動態綁定 */
-}
-
-.roster-name {
-  text-orientation: upright;
-  /*font-weight: bold;*/
-  white-space: nowrap;
-  line-height: 1.2;
-  font-family: 'Kaiti', serif;
-  /* 確保名字本身不會佔據過多寬度導致間距看起來很大 */
-  width: fit-content;
-  height:200px;
-}
-
-
-/* 選取框 */
-.selection-border {
-  position: absolute; top: -4px; left: -4px; right: -4px; bottom: -4px;
-  border: 2px solid var(--selection-color); pointer-events: none; z-index: 100;
-}
-
-.resize-handle {
-  position: absolute; width: 10px; height: 10px; background: white;
-  border: 2px solid var(--selection-color); border-radius: 50%;
-}
-.top-left { top: -6px; left: -6px; } .top-right { top: -6px; right: -6px; }
-.bottom-left { bottom: -6px; left: -6px; } .bottom-right { bottom: -6px; right: -6px; }
-
-.x-small { font-size: 0.7rem; } .ls-1 { letter-spacing: 1px; }
-.bg-gradient-primary { background: linear-gradient(135deg, #0d6efd 0%, #0043a8 100%); }
-.bg-gradient-dark { background: linear-gradient(135deg, #212529 0%, #000000 100%); }
-
-.page-info-badge {
-  background: rgba(255,255,255,0.9); padding: 5px 15px; border-radius: 20px; font-weight: bold; color: #333;
-}
-
-/* Print Mode */
-@media print {
-  app-floating-widget, .canvas-area, .page-info-badge { display: none !important; }
-  :host { display: block; background: white; }
-
-  .tablet-paper {
-    position: relative !important;
-    margin: 0;
-    page-break-after: always; /* 強制分頁 */
-    box-shadow: none !important; background: transparent !important;
-    width: 100% !important; height: 100% !important;
-    -webkit-print-color-adjust: exact; print-color-adjust: exact;
-  }
-  .tablet-paper:last-child { page-break-after: auto; }
-
-  .paper-size-label, .selection-border { display: none; }
-
-  /* 確保背景圖列印 */
-  img.bg-image-layer {
-    -webkit-print-color-adjust: exact; print-color-adjust: exact;
-    display: block !important;
-  }
-}
-
-.resizable-box {
-  width: 300px;
-  height: 200px;
-  border: 1px solid #ccc;
-
-  /* 關鍵屬性 */
-  resize: both; /* 允許水平和垂直調整 (或是 horizontal, vertical) */
-  overflow: auto; /* 必須設定 overflow (非 visible) resize 才會生效 */
-
-  /* 選用：限制最小最大尺寸 */
-  min-width: 100px;
-  min-height: 100px;
-}
-
-
-.combined-vertical-mode {
-  writing-mode: vertical-rl; /* 設定為直排 */
-  font-family: "KaiTi", "BiauKai", serif;
-  font-size: 48px;
-  font-weight: bold;
-  letter-spacing: 0.1em;
-  /* 為了讓排版置中好看，可以加這行 */
-  align-items: center;
-}
-
-.combined {
-  /* --- 關鍵修改 --- */
-
-  /* 1. 取消原本的擠壓設定 */
-  text-combine-upright: none;
-
-  /* 2. 將這三個字改回「橫向排版」 */
-  writing-mode: horizontal-tb;
-
-  /* 3. 讓它變成一個區塊，這樣字體才會撐開空間，不會擠在一起 */
-  display: inline-block;
-
-  /* 4. (選用) 調整它跟下方直書文字的對齊方式 */
-  vertical-align: middle;
-
-  /* 5. (選用) 如果希望字與字之間稍微寬鬆一點 */
-  letter-spacing: 0.05em;
-}
-
-.combined-small {
-  font-size: 32px !important;
-}
-
-.auto-wrap-text {
-  /* 1. 設定為直書模式 */
-  writing-mode: vertical-rl;
-  text-orientation: upright; /* 讓文字直立 */
-
-  /* 2. 關鍵：限制最大高度 */
-  /* 設定為 8em 代表大約 8 個字的高度，超過就會自動換行 */
-  max-height: 8em;
-
-  /* 3. 關鍵：允許換行 */
-  white-space: normal; /* 或 pre-wrap */
-
-  /* 4. 調整換行的方向與對齊 (選用) */
-  display: inline-block; /* 讓容器隨內容撐開 */
-  word-break: break-all; /* 確保長單字或連續文字也能強制切斷換行 */
-}
-
-.ancestor-wrapper {
-    /* 重置為橫向流，這樣 column 才會是真正的上下堆疊 */
-    writing-mode: horizontal-tb;
-    display: flex;
-    flex-direction: column;
-    align-items: center; /* 水平置中 */
-    justify-content: center;
-    width: fit-content;
-}
-
-.main-name {
-    line-height: 1.2;
-    /* 保持大字 */
-}
-
-.sub-text {
-    font-size: 0.6em; /* 縮小字體 */
-    line-height: 1.2;
-    margin-top: 4px; /* 與上方林張的間距 */
-    white-space: nowrap; /* 避免自動換行 */
-    writing-mode:vertical-rl
-}

web/admin/item/jquery-ui/AUTHORS.txt

@@ -1,384 +0,0 @@
-Authors ordered by first contribution
-A list of current team members is available at https://jqueryui.com/about
-
-Paul Bakaus <paul.bakaus@gmail.com>
-Richard Worth <rdworth@gmail.com>
-Yehuda Katz <wycats@gmail.com>
-Sean Catchpole <sean@sunsean.com>
-John Resig <jeresig@gmail.com>
-Tane Piper <piper.tane@gmail.com>
-Dmitri Gaskin <dmitrig01@gmail.com>
-Klaus Hartl <klaus.hartl@gmail.com>
-Stefan Petre <stefan.petre@gmail.com>
-Gilles van den Hoven <gilles@webunity.nl>
-Micheil Bryan Smith <micheil@brandedcode.com>
-Jörn Zaefferer <joern.zaefferer@gmail.com>
-Marc Grabanski <m@marcgrabanski.com>
-Keith Wood <kbwood@iinet.com.au>
-Brandon Aaron <brandon.aaron@gmail.com>
-Scott González <scott.gonzalez@gmail.com>
-Eduardo Lundgren <eduardolundgren@gmail.com>
-Aaron Eisenberger <aaronchi@gmail.com>
-Joan Piedra <theneojp@gmail.com>
-Bruno Basto <b.basto@gmail.com>
-Remy Sharp <remy@leftlogic.com>
-Bohdan Ganicky <bohdan.ganicky@gmail.com>
-David Bolter <david.bolter@gmail.com>
-Chi Cheng <cloudream@gmail.com>
-Ca-Phun Ung <pazu2k@gmail.com>
-Ariel Flesler <aflesler@gmail.com>
-Maggie Wachs <maggie@filamentgroup.com>
-Scott Jehl <scottjehl@gmail.com>
-Todd Parker <todd@filamentgroup.com>
-Andrew Powell <andrew@shellscape.org>
-Brant Burnett <btburnett3@gmail.com>
-Douglas Neiner <doug@dougneiner.com>
-Paul Irish <paul.irish@gmail.com>
-Ralph Whitbeck <ralph.whitbeck@gmail.com>
-Thibault Duplessis <thibault.duplessis@gmail.com>
-Dominique Vincent <dominique.vincent@toitl.com>
-Jack Hsu <jack.hsu@gmail.com>
-Adam Sontag <ajpiano@ajpiano.com>
-Carl Fürstenberg <carl@excito.com>
-Kevin Dalman <development@allpro.net>
-Alberto Fernández Capel <afcapel@gmail.com>
-Jacek Jędrzejewski (https://jacek.jedrzejewski.name)
-Ting Kuei <ting@kuei.com>
-Samuel Cormier-Iijima <sam@chide.it>
-Jon Palmer <jonspalmer@gmail.com>
-Ben Hollis <bhollis@amazon.com>
-Justin MacCarthy <Justin@Rubystars.biz>
-Eyal Kobrigo <kobrigo@hotmail.com>
-Tiago Freire <tiago.freire@gmail.com>
-Diego Tres <diegotres@gmail.com>
-Holger Rüprich <holger@rueprich.de>
-Ziling Zhao <zilingzhao@gmail.com>
-Mike Alsup <malsup@gmail.com>
-Robson Braga Araujo <robsonbraga@gmail.com>
-Pierre-Henri Ausseil <ph.ausseil@gmail.com>
-Christopher McCulloh <cmcculloh@gmail.com>
-Andrew Newcomb <ext.github@preceptsoftware.co.uk>
-Lim Chee Aun <cheeaun@gmail.com>
-Jorge Barreiro <yortx.barry@gmail.com>
-Daniel Steigerwald <daniel@steigerwald.cz>
-John Firebaugh <john_firebaugh@bigfix.com>
-John Enters <github@darkdark.net>
-Andrey Kapitcyn <ru.m157y@gmail.com>
-Dmitry Petrov <dpetroff@gmail.com>
-Eric Hynds <eric@hynds.net>
-Chairat Sunthornwiphat <pipo@sixhead.com>
-Josh Varner <josh.varner@gmail.com>
-Stéphane Raimbault <stephane.raimbault@gmail.com>
-Jay Merrifield <fracmak@gmail.com>
-J. Ryan Stinnett <jryans@gmail.com>
-Peter Heiberg <peter@heiberg.se>
-Alex Dovenmuehle <adovenmuehle@gmail.com>
-Jamie Gegerson <git@jamiegegerson.com>
-Raymond Schwartz <skeetergraphics@gmail.com>
-Phillip Barnes <philbar@gmail.com>
-Kyle Wilkinson <kai@wikyd.org>
-Khaled AlHourani <me@khaledalhourani.com>
-Marian Rudzynski <mr@impaled.org>
-Jean-Francois Remy <jeff@melix.org>
-Doug Blood <dougblood@gmail.com>
-Filippo Cavallarin <filippo.cavallarin@codseq.it>
-Heiko Henning <heiko@thehennings.ch>
-Aliaksandr Rahalevich <saksmlz@gmail.com>
-Mario Visic <mario@mariovisic.com>
-Xavi Ramirez <xavi.rmz@gmail.com>
-Max Schnur <max.schnur@gmail.com>
-Saji Nediyanchath <saji89@gmail.com>
-Corey Frang <gnarf37@gmail.com>
-Aaron Peterson <aaronp123@yahoo.com>
-Ivan Peters <ivan@ivanpeters.com>
-Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
-Marcos Sousa <falecomigo@marcossousa.com>
-Michael DellaNoce <mdellanoce@mailtrust.com>
-George Marshall <echosx@gmail.com>
-Tobias Brunner <tobias@strongswan.org>
-Martin Solli <msolli@gmail.com>
-David Petersen <public@petersendidit.com>
-Dan Heberden <danheberden@gmail.com>
-William Kevin Manire <williamkmanire@gmail.com>
-Gilmore Davidson <gilmoreorless@gmail.com>
-Michael Wu <michaelmwu@gmail.com>
-Adam Parod <mystic414@gmail.com>
-Guillaume Gautreau <guillaume+github@ghusse.com>
-Marcel Toele <EleotleCram@gmail.com>
-Dan Streetman <ddstreet@ieee.org>
-Matt Hoskins <matt@nipltd.com>
-Giovanni Giacobbi <giovanni@giacobbi.net>
-Kyle Florence <kyle.florence@gmail.com>
-Pavol Hluchý <lopo@losys.sk>
-Hans Hillen <hans.hillen@gmail.com>
-Mark Johnson <virgofx@live.com>
-Trey Hunner <treyhunner@gmail.com>
-Shane Whittet <whittet@gmail.com>
-Edward A Faulkner <ef@alum.mit.edu>
-Adam Baratz <adam@adambaratz.com>
-Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
-Eike Send <eike.send@gmail.com>
-Kris Borchers <kris.borchers@gmail.com>
-Eddie Monge <eddie@eddiemonge.com>
-Israel Tsadok <itsadok@gmail.com>
-Carson McDonald <carson@ioncannon.net>
-Jason Davies <jason@jasondavies.com>
-Garrison Locke <gplocke@gmail.com>
-David Murdoch <david@davidmurdoch.com>
-Benjamin Scott Boyle <benjamins.boyle@gmail.com>
-Jesse Baird <jebaird@gmail.com>
-Jonathan Vingiano <jvingiano@gmail.com>
-Dylan Just <dev@ephox.com>
-Hiroshi Tomita <tomykaira@gmail.com>
-Glenn Goodrich <glenn.goodrich@gmail.com>
-Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
-Ryan Neufeld <ryan@neufeldmail.com>
-Marc Neuwirth <marc.neuwirth@gmail.com>
-Philip Graham <philip.robert.graham@gmail.com>
-Benjamin Sterling <benjamin.sterling@kenzomedia.com>
-Wesley Walser <waw325@gmail.com>
-Kouhei Sutou <kou@clear-code.com>
-Karl Kirch <karlkrch@gmail.com>
-Chris Kelly <ckdake@ckdake.com>
-Jason Oster <jay@kodewerx.org>
-Felix Nagel <info@felixnagel.com>
-Alexander Polomoshnov <alex.polomoshnov@gmail.com>
-David Leal <dgleal@gmail.com>
-Igor Milla <igor.fsp.milla@gmail.com>
-Dave Methvin <dave.methvin@gmail.com>
-Florian Gutmann <f.gutmann@chronimo.com>
-Marwan Al Jubeh <marwan.aljubeh@gmail.com>
-Milan Broum <midlis@googlemail.com>
-Sebastian Sauer <info@dynpages.de>
-Gaëtan Muller <m.gaetan89@gmail.com>
-Michel Weimerskirch <michel@weimerskirch.net>
-William Griffiths <william@ycymro.com>
-Stojce Slavkovski <stojce@gmail.com>
-David Soms <david.soms@gmail.com>
-David De Sloovere <david.desloovere@outlook.com>
-Michael P. Jung <michael.jung@terreon.de>
-Shannon Pekary <spekary@gmail.com>
-Dan Wellman <danwellman@hotmail.com>
-Matthew Edward Hutton <meh@corefiling.co.uk>
-James Khoury <james@jameskhoury.com>
-Rob Loach <robloach@gmail.com>
-Alberto Monteiro <betimbrasil@gmail.com>
-Alex Rhea <alex.rhea@gmail.com>
-Krzysztof Rosiński <rozwell69@gmail.com>
-Ryan Olton <oltonr@gmail.com>
-Genie <386@mail.com>
-Rick Waldron <waldron.rick@gmail.com>
-Ian Simpson <spoonlikesham@gmail.com>
-Lev Kitsis <spam4lev@gmail.com>
-TJ VanToll <tj.vantoll@gmail.com>
-Justin Domnitz <jdomnitz@gmail.com>
-Douglas Cerna <douglascerna@yahoo.com>
-Bert ter Heide <bertjh@hotmail.com>
-Jasvir Nagra <jasvir@gmail.com>
-Yuriy Khabarov <13real008@gmail.com>
-Harri Kilpiö <harri.kilpio@gmail.com>
-Lado Lomidze <lado.lomidze@gmail.com>
-Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
-Simon Sattes <simon.sattes@gmail.com>
-Jo Liss <joliss42@gmail.com>
-Guntupalli Karunakar <karunakarg@yahoo.com>
-Shahyar Ghobadpour <shahyar@gmail.com>
-Lukasz Lipinski <uzza17@gmail.com>
-Timo Tijhof <krinklemail@gmail.com>
-Jason Moon <jmoon@socialcast.com>
-Martin Frost <martinf55@hotmail.com>
-Eneko Illarramendi <eneko@illarra.com>
-EungJun Yi <semtlenori@gmail.com>
-Courtland Allen <courtlandallen@gmail.com>
-Viktar Varvanovich <non4eg@gmail.com>
-Danny Trunk <dtrunk90@gmail.com>
-Pavel Stetina <pavel.stetina@nangu.tv>
-Michael Stay <metaweta@gmail.com>
-Steven Roussey <sroussey@gmail.com>
-Michael Hollis <hollis21@gmail.com>
-Lee Rowlands <lee.rowlands@previousnext.com.au>
-Timmy Willison <timmywillisn@gmail.com>
-Karl Swedberg <kswedberg@gmail.com>
-Baoju Yuan <the_guy_1987@hotmail.com>
-Maciej Mroziński <maciej.k.mrozinski@gmail.com>
-Luis Dalmolin <luis.nh@gmail.com>
-Mark Aaron Shirley <maspwr@gmail.com>
-Martin Hoch <martin@fidion.de>
-Jiayi Yang <tr870829@gmail.com>
-Philipp Benjamin Köppchen <xgxtpbk@gws.ms>
-Sindre Sorhus <sindresorhus@gmail.com>
-Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
-Jared A. Scheel <jared@jaredscheel.com>
-Rafael Xavier de Souza <rxaviers@gmail.com>
-John Chen <zhang.z.chen@intel.com>
-Robert Beuligmann <robertbeuligmann@gmail.com>
-Dale Kocian <dale.kocian@gmail.com>
-Mike Sherov <mike.sherov@gmail.com>
-Andrew Couch <andy@couchand.com>
-Marc-Andre Lafortune <github@marc-andre.ca>
-Nate Eagle <nate.eagle@teamaol.com>
-David Souther <davidsouther@gmail.com>
-Mathias Stenbom <mathias@stenbom.com>
-Sergey Kartashov <ebishkek@yandex.ru>
-Avinash R <nashpapa@gmail.com>
-Ethan Romba <ethanromba@gmail.com>
-Cory Gackenheimer <cory.gack@gmail.com>
-Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
-Roman Salnikov <bardt.dz@gmail.com>
-Anika Henke <anika@selfthinker.org>
-Samuel Bovée <samycookie2000@yahoo.fr>
-Fabrício Matté <ult_combo@hotmail.com>
-Viktor Kojouharov <vkojouharov@gmail.com>
-Pawel Maruszczyk (http://hrabstwo.net)
-Pavel Selitskas <p.selitskas@gmail.com>
-Bjørn Johansen <post@bjornjohansen.no>
-Matthieu Penant <thieum22@hotmail.com>
-Dominic Barnes <dominic@dbarnes.info>
-David Sullivan <david.sullivan@gmail.com>
-Thomas Jaggi <thomas@responsive.ch>
-Vahid Sohrabloo <vahid4134@gmail.com>
-Travis Carden <travis.carden@gmail.com>
-Bruno M. Custódio <bruno@brunomcustodio.com>
-Nathanael Silverman <nathanael.silverman@gmail.com>
-Christian Wenz <christian@wenz.org>
-Steve Urmston <steve@urm.st>
-Zaven Muradyan <megalivoithos@gmail.com>
-Woody Gilk <shadowhand@deviantart.com>
-Zbigniew Motyka <zbigniew.motyka@gmail.com>
-Suhail Alkowaileet <xsoh.k7@gmail.com>
-Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
-David Hansen <hansede@gmail.com>
-Brian Grinstead <briangrinstead@gmail.com>
-Christian Klammer <christian314159@gmail.com>
-Steven Luscher <jquerycla@steveluscher.com>
-Gan Eng Chin <engchin.gan@gmail.com>
-Gabriel Schulhof <gabriel.schulhof@intel.com>
-Alexander Schmitz <arschmitz@gmail.com>
-Vilhjálmur Skúlason <vis@dmm.is>
-Siebrand Mazeland <siebrand@kitano.nl>
-Mohsen Ekhtiari <mohsenekhtiari@yahoo.com>
-Pere Orga <gotrunks@gmail.com>
-Jasper de Groot <mail@ugomobi.com>
-Stephane Deschamps <stephane.deschamps@gmail.com>
-Jyoti Deka <dekajp@gmail.com>
-Andrei Picus <office.nightcrawler@gmail.com>
-Ondrej Novy <novy@ondrej.org>
-Jacob McCutcheon <jacob.mccutcheon@gmail.com>
-Monika Piotrowicz <monika.piotrowicz@gmail.com>
-Imants Horsts <imants.horsts@inbox.lv>
-Eric Dahl <eric.c.dahl@gmail.com>
-Dave Stein <dave@behance.com>
-Dylan Barrell <dylan@barrell.com>
-Daniel DeGroff <djdegroff@gmail.com>
-Michael Wiencek <mwtuea@gmail.com>
-Thomas Meyer <meyertee@gmail.com>
-Ruslan Yakhyaev <ruslan@ruslan.io>
-Brian J. Dowling <bjd-dev@simplicity.net>
-Ben Higgins <ben@extrahop.com>
-Yermo Lamers <yml@yml.com>
-Patrick Stapleton <github@gdi2290.com>
-Trisha Crowley <trisha.crowley@gmail.com>
-Usman Akeju <akeju00+github@gmail.com>
-Rodrigo Menezes <rod333@gmail.com>
-Jacques Perrault <jacques_perrault@us.ibm.com>
-Frederik Elvhage <frederik.elvhage@googlemail.com>
-Will Holley <willholley@gmail.com>
-Uri Gilad <antishok@gmail.com>
-Richard Gibson <richard.gibson@gmail.com>
-Simen Bekkhus <sbekkhus91@gmail.com>
-Chen Eshchar <eshcharc@gmail.com>
-Bruno Pérel <brunoperel@gmail.com>
-Mohammed Alshehri <m@dralshehri.com>
-Lisa Seacat DeLuca <ldeluca@us.ibm.com>
-Anne-Gaelle Colom <coloma@westminster.ac.uk>
-Adam Foster <slimfoster@gmail.com>
-Luke Page <luke.a.page@gmail.com>
-Daniel Owens <daniel@matchstickmixup.com>
-Michael Orchard <morchard@scottlogic.co.uk>
-Marcus Warren <marcus@envoke.com>
-Nils Heuermann <nils@world-of-scripts.de>
-Marco Ziech <marco@ziech.net>
-Patricia Juarez <patrixd@gmail.com>
-Ben Mosher <me@benmosher.com>
-Ablay Keldibek <atomio.ak@gmail.com>
-Thomas Applencourt <thomas.applencourt@irsamc.ups-tlse.fr>
-Jiabao Wu <jiabao.foss@gmail.com>
-Eric Lee Carraway <github@ericcarraway.com>
-Victor Homyakov <vkhomyackov@gmail.com>
-Myeongjin Lee <aranet100@gmail.com>
-Liran Sharir <lsharir@gmail.com>
-Weston Ruter <weston@xwp.co>
-Mani Mishra <manimishra902@gmail.com>
-Hannah Methvin <hannahmethvin@gmail.com>
-Leonardo Balter <leonardo.balter@gmail.com>
-Benjamin Albert <benjamin_a5@yahoo.com>
-Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
-Alyosha Pushak <alyosha.pushak@gmail.com>
-Fahad Ahmad <fahadahmad41@hotmail.com>
-Matt Brundage <github@mattbrundage.com>
-Francesc Baeta <francesc.baeta@gmail.com>
-Piotr Baran <piotros@wp.pl>
-Mukul Hase <mukulhase@gmail.com>
-Konstantin Dinev <kdinev@mail.bw.edu>
-Rand Scullard <rand@randscullard.com>
-Dan Strohl <dan@wjcg.net>
-Maksim Ryzhikov <rv.maksim@gmail.com>
-Amine HADDAD <haddad@allegorie.tv>
-Amanpreet Singh <apsdehal@gmail.com>
-Alexey Balchunas <bleshik@gmail.com>
-Peter Kehl <peter.kehl@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Johannes Schäfer <johnschaefer@gmx.de>
-Ville Skyttä <ville.skytta@iki.fi>
-Ryan Oriecuia <ryan.oriecuia@visioncritical.com>
-Sergei Ratnikov <sergeir82@gmail.com>
-milk54 <milk851@gmail.com>
-Evelyn Masso <evoutofambit@gmail.com>
-Robin <mail@robin-fowler.com>
-Simon Asika <asika32764@gmail.com>
-Kevin Cupp <kevin.cupp@gmail.com>
-Jeremy Mickelson <Jeremy.Mickelson@gmail.com>
-Kyle Rosenberg <kyle.rosenberg@gmail.com>
-Petri Partio <petri.partio@gmail.com>
-pallxk <github@pallxk.com>
-Luke Brookhart <luke@onjax.com>
-claudi <hirt-claudia@gmx.de>
-Eirik Sletteberg <eiriksletteberg@gmail.com>
-Albert Johansson <albert@intervaro.se>
-A. Wells <borgboyone@users.noreply.github.com>
-Robert Brignull <robertbrignull@gmail.com>
-Horus68 <pauloizidoro@gmail.com>
-Maksymenkov Eugene <foatei@gmail.com>
-OskarNS <soerensen.oskar@gmail.com>
-Gez Quinn <holla@gezquinn.design>
-jigar gala <jigar.gala140291@gmail.com>
-Florian Wegscheider <flo.wegscheider@gmail.com>
-Fatér Zsolt <fater.zsolt@gmail.com>
-Szabolcs Szabolcsi-Toth <nec@shell8.net>
-Jérémy Munsch <github@jeremydev.ovh>
-Hrvoje Novosel <hrvoje.novosel@gmail.com>
-Paul Capron <PaulCapron@users.noreply.github.com>
-Micah Miller <mikhey@runbox.com>
-sakshi87 <53863764+sakshi87@users.noreply.github.com>
-Mikolaj Wolicki <wolicki.mikolaj@gmail.com>
-Patrick McKay <patrick.mckay@vumc.org>
-c-lambert <58025159+c-lambert@users.noreply.github.com>
-Josep Sanz <josepsanzcamp@gmail.com>
-Ben Mullins <benm@umich.edu>
-Christian Oliff <christianoliff@pm.me>
-dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-Adam Lidén Hällgren <adamlh92@gmail.com>
-James Hinderks <hinderks@gmail.com>
-Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
-Matías Cánepa <matias.canepa@gmail.com>
-Ashish Kurmi <100655670+boahc077@users.noreply.github.com>
-DeerBear <andrea.raimondi@gmail.com>
-Дилян Палаузов <dpa-github@aegee.org>
-Kenneth DeBacker <kcdebacker@gmail.com>
-Timo Tijhof <krinkle@fastmail.com>
-Timmy Willison <timmywil@users.noreply.github.com>
-divdeploy <166095818+divdeploy@users.noreply.github.com>
-mark van tilburg <markvantilburg@gmail.com>
-Ralf Koller <1665422+rpkoller@users.noreply.github.com>
-Porter Clevidence <116387727+porterclev@users.noreply.github.com>
-Daniel García <93217193+Daniel-Garmig@users.noreply.github.com>

web/admin/item/jquery-ui/LICENSE.txt

@@ -1,43 +0,0 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-ui
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code contained within the demos directory.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

web/admin/item/jquery-ui/index.html

@@ -1,503 +0,0 @@
-<!doctype html>
-<html lang="us">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Example Page</title>
-	<link href="jquery-ui.css" rel="stylesheet">
-	<style>
-	body{
-		font-family: "Trebuchet MS", sans-serif;
-		margin: 50px;
-	}
-	.demoHeaders {
-		margin-top: 2em;
-	}
-	#dialog-link {
-		padding: .4em 1em .4em 20px;
-		text-decoration: none;
-		position: relative;
-	}
-	#dialog-link span.ui-icon {
-		margin: 0 5px 0 0;
-		position: absolute;
-		left: .2em;
-		top: 50%;
-		margin-top: -8px;
-	}
-	#icons {
-		margin: 0;
-		padding: 0;
-	}
-	#icons li {
-		margin: 2px;
-		position: relative;
-		padding: 4px 0;
-		cursor: pointer;
-		float: left;
-		list-style: none;
-	}
-	#icons span.ui-icon {
-		float: left;
-		margin: 0 4px;
-	}
-	.fakewindowcontain .ui-widget-overlay {
-		position: absolute;
-	}
-	select {
-		width: 200px;
-	}
-	</style>
-</head>
-<body>
-
-<h1>Welcome to jQuery UI!</h1>
-
-<div class="ui-widget">
-	<p>This page demonstrates the widgets and theme you selected in Download Builder. Please make sure you are using them with a compatible jQuery version.</p>
-</div>
-
-<h1>YOUR COMPONENTS:</h1>
-
-<!-- Accordion -->
-<h2 class="demoHeaders">Accordion</h2>
-<div id="accordion">
-	<h3>First</h3>
-	<div>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</div>
-	<h3>Second</h3>
-	<div>Phasellus mattis tincidunt nibh.</div>
-	<h3>Third</h3>
-	<div>Nam dui erat, auctor a, dignissim quis.</div>
-</div>
-
-<!-- Autocomplete -->
-<h2 class="demoHeaders">Autocomplete</h2>
-<div>
-	<input id="autocomplete" title="type &quot;a&quot;">
-</div>
-
-<!-- Button -->
-<h2 class="demoHeaders">Button</h2>
-<button id="button">A button element</button>
-<button id="button-icon">An icon-only button</button>
-
-<!-- Checkboxradio -->
-<h2 class="demoHeaders">Checkboxradio</h2>
-<form style="margin-top: 1em;">
-	<div id="radioset">
-		<input type="radio" id="radio1" name="radio"><label for="radio1">Choice 1</label>
-		<input type="radio" id="radio2" name="radio" checked="checked"><label for="radio2">Choice 2</label>
-		<input type="radio" id="radio3" name="radio"><label for="radio3">Choice 3</label>
-	</div>
-</form>
-
-<!-- Controlgroup -->
-<h2 class="demoHeaders">Controlgroup</h2>
-<fieldset>
-	<legend>Rental Car</legend>
-	<div id="controlgroup">
-		<select id="car-type">
-			<option>Compact car</option>
-			<option>Midsize car</option>
-			<option>Full size car</option>
-			<option>SUV</option>
-			<option>Luxury</option>
-			<option>Truck</option>
-			<option>Van</option>
-		</select>
-		<label for="transmission-standard">Standard</label>
-		<input type="radio" name="transmission" id="transmission-standard">
-		<label for="transmission-automatic">Automatic</label>
-		<input type="radio" name="transmission" id="transmission-automatic">
-		<label for="insurance">Insurance</label>
-		<input type="checkbox" name="insurance" id="insurance">
-		<label for="horizontal-spinner" class="ui-controlgroup-label"># of cars</label>
-		<input id="horizontal-spinner" class="ui-spinner-input">
-		<button>Book Now!</button>
-	</div>
-</fieldset>
-
-<!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
-<div id="tabs">
-	<ul>
-		<li><a href="#tabs-1">First</a></li>
-		<li><a href="#tabs-2">Second</a></li>
-		<li><a href="#tabs-3">Third</a></li>
-	</ul>
-	<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
-	<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
-	<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
-</div>
-
-<h2 class="demoHeaders">Dialog</h2>
-<p>
-	<button id="dialog-link" class="ui-button ui-corner-all ui-widget">
-		<span class="ui-icon ui-icon-newwin"></span>Open Dialog
-	</button>
-</p>
-
-<h2 class="demoHeaders">Overlay and Shadow Classes</h2>
-<div style="position: relative; width: 96%; height: 200px; padding:1% 2%; overflow:hidden;" class="fakewindowcontain">
-	<p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
-
-	<!-- ui-dialog -->
-	<div class="ui-widget-overlay ui-front"></div>
-	<div style="position: absolute; width: 320px; left: 50px; top: 30px; padding: 1.2em" class="ui-widget ui-front ui-widget-content ui-corner-all ui-widget-shadow">
-		Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-	</div>
-
-</div>
-
-<!-- ui-dialog -->
-<div id="dialog" title="Dialog Title">
-	<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-</div>
-
-
-<h2 class="demoHeaders">Framework Icons (content color preview)</h2>
-<ul id="icons" class="ui-widget ui-helper-clearfix">
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-ne"><span class="ui-icon ui-icon-caret-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-e"><span class="ui-icon ui-icon-caret-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-se"><span class="ui-icon ui-icon-caret-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-s"><span class="ui-icon ui-icon-caret-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-sw"><span class="ui-icon ui-icon-caret-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-w"><span class="ui-icon ui-icon-caret-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-nw"><span class="ui-icon ui-icon-caret-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-n-s"><span class="ui-icon ui-icon-caret-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-e-w"><span class="ui-icon ui-icon-caret-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-sw"><span class="ui-icon ui-icon-triangle-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-w"><span class="ui-icon ui-icon-triangle-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-s"><span class="ui-icon ui-icon-arrow-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-sw"><span class="ui-icon ui-icon-arrow-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-w"><span class="ui-icon ui-icon-arrow-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-e"><span class="ui-icon ui-icon-arrowstop-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-s"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-w"><span class="ui-icon ui-icon-arrowstop-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-w"><span class="ui-icon ui-icon-arrowthick-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-nw"><span class="ui-icon ui-icon-arrowthick-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-n-s"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-w"><span class="ui-icon ui-icon-arrowthickstop-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-w"><span class="ui-icon ui-icon-arrowreturnthick-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-n"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-w"><span class="ui-icon ui-icon-arrowrefresh-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-open"><span class="ui-icon ui-icon-mail-open"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-suitcase"><span class="ui-icon ui-icon-suitcase"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-comment"><span class="ui-icon ui-icon-comment"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-tag"><span class="ui-icon ui-icon-tag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-home"><span class="ui-icon ui-icon-home"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-flag"><span class="ui-icon ui-icon-flag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomin"><span class="ui-icon ui-icon-zoomin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomout"><span class="ui-icon ui-icon-zoomout"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-search"><span class="ui-icon ui-icon-search"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-plus"><span class="ui-icon ui-icon-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-plusthick"><span class="ui-icon ui-icon-plusthick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-minus"><span class="ui-icon ui-icon-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-clipboard"><span class="ui-icon ui-icon-clipboard"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-copy"><span class="ui-icon ui-icon-copy"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-contact"><span class="ui-icon ui-icon-contact"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-image"><span class="ui-icon ui-icon-image"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-check"><span class="ui-icon ui-icon-check"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-bullet"><span class="ui-icon ui-icon-bullet"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-off"><span class="ui-icon ui-icon-radio-off"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-first"><span class="ui-icon ui-icon-seek-first"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-stop"><span class="ui-icon ui-icon-stop"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-n"><span class="ui-icon ui-icon-circle-triangle-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-e"><span class="ui-icon ui-icon-circle-arrow-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-s"><span class="ui-icon ui-icon-circle-arrow-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-minus"><span class="ui-icon ui-icon-circlesmall-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-close"><span class="ui-icon ui-icon-circlesmall-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
-</ul>
-
-<!-- Slider -->
-<h2 class="demoHeaders">Slider</h2>
-<div id="slider"></div>
-
-<!-- Datepicker -->
-<h2 class="demoHeaders">Datepicker</h2>
-<div id="datepicker"></div>
-
-<!-- Progressbar -->
-<h2 class="demoHeaders">Progressbar</h2>
-<div id="progressbar"></div>
-
-<!-- Progressbar -->
-<h2 class="demoHeaders">Selectmenu</h2>
-<select id="selectmenu">
-	<option>Slower</option>
-	<option>Slow</option>
-	<option selected="selected">Medium</option>
-	<option>Fast</option>
-	<option>Faster</option>
-</select>
-
-<!-- Spinner -->
-<h2 class="demoHeaders">Spinner</h2>
-<input id="spinner">
-
-<!-- Menu -->
-<h2 class="demoHeaders">Menu</h2>
-<ul style="width:100px;" id="menu">
-	<li><div>Item 1</div></li>
-	<li><div>Item 2</div></li>
-	<li><div>Item 3</div>
-		<ul>
-			<li><div>Item 3-1</div></li>
-			<li><div>Item 3-2</div></li>
-			<li><div>Item 3-3</div></li>
-			<li><div>Item 3-4</div></li>
-			<li><div>Item 3-5</div></li>
-		</ul>
-	</li>
-	<li><div>Item 4</div></li>
-	<li><div>Item 5</div></li>
-</ul>
-
-<!-- Tooltip -->
-<h2 class="demoHeaders">Tooltip</h2>
-<p id="tooltip">
-	<a href="#" title="That&apos;s what this widget is">Tooltips</a> can be attached to any element. When you hover
-the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
-</p>
-
-<!-- Highlight / Error -->
-<h2 class="demoHeaders">Highlight / Error</h2>
-<div class="ui-widget">
-	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
-		<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-		<strong>Hey!</strong> Sample ui-state-highlight style.</p>
-	</div>
-</div>
-<br>
-<div class="ui-widget">
-	<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;">
-		<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
-		<strong>Alert:</strong> Sample ui-state-error style.</p>
-	</div>
-</div>
-
-<script src="external/jquery/jquery.js"></script>
-<script src="jquery-ui.js"></script>
-<script>
-$( "#accordion" ).accordion();
-
-var availableTags = [
-	"ActionScript",
-	"AppleScript",
-	"Asp",
-	"BASIC",
-	"C",
-	"C++",
-	"Clojure",
-	"COBOL",
-	"ColdFusion",
-	"Erlang",
-	"Fortran",
-	"Groovy",
-	"Haskell",
-	"Java",
-	"JavaScript",
-	"Lisp",
-	"Perl",
-	"PHP",
-	"Python",
-	"Ruby",
-	"Scala",
-	"Scheme"
-];
-$( "#autocomplete" ).autocomplete({
-	source: availableTags
-});
-
-$( "#button" ).button();
-$( "#button-icon" ).button({
-	icon: "ui-icon-gear",
-	showLabel: false
-});
-
-$( "#radioset" ).controlgroup();
-
-$( "#controlgroup" ).controlgroup();
-
-$( "#tabs" ).tabs();
-
-$( "#dialog" ).dialog({
-	autoOpen: false,
-	width: 400,
-	buttons: [
-		{
-			text: "Ok",
-			click: function() {
-				$( this ).dialog( "close" );
-			}
-		},
-		{
-			text: "Cancel",
-			click: function() {
-				$( this ).dialog( "close" );
-			}
-		}
-	]
-});
-
-// Link to open the dialog
-$( "#dialog-link" ).click(function( event ) {
-	$( "#dialog" ).dialog( "open" );
-	event.preventDefault();
-});
-
-$( "#datepicker" ).datepicker({
-	inline: true
-});
-
-$( "#slider" ).slider({
-	range: true,
-	values: [ 17, 67 ]
-});
-
-$( "#progressbar" ).progressbar({
-	value: 20
-});
-
-$( "#spinner" ).spinner();
-
-$( "#menu" ).menu();
-
-$( "#tooltip" ).tooltip();
-
-$( "#selectmenu" ).selectmenu();
-
-// Hover states on the static widgets
-$( "#dialog-link, #icons li" ).hover(
-	function() {
-		$( this ).addClass( "ui-state-hover" );
-	},
-	function() {
-		$( this ).removeClass( "ui-state-hover" );
-	}
-);
-</script>
-</body>
-</html>

web/admin/item/jquery-ui/jquery-ui.structure.css

@@ -1,863 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.14.2
- * https://jqueryui.com
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license.
- * https://jquery.org/license
- *
- * https://api.jqueryui.com/category/theming/
- */
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-	pointer-events: none;
-}
-
-
-/* Icons
-----------------------------------*/
-.ui-icon {
-	display: inline-block;
-	vertical-align: middle;
-	margin-top: -.25em;
-	position: relative;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-.ui-widget-icon-block {
-	left: 50%;
-	margin-left: -8px;
-	display: block;
-}
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: 0;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	margin: 0;
-	cursor: pointer;
-}
-.ui-menu .ui-menu-item-wrapper {
-	position: relative;
-	padding: 3px 1em 3px .4em;
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item-wrapper {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-button {
-	padding: .4em 1em;
-	display: inline-block;
-	position: relative;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	-webkit-user-select: none;
-	user-select: none;
-}
-
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2em;
-	box-sizing: border-box;
-	text-indent: -9999px;
-	white-space: nowrap;
-}
-
-/* no icon support for input elements */
-input.ui-button.ui-button-icon-only {
-	text-indent: 0;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-top: -8px;
-	margin-left: -8px;
-}
-
-.ui-button.ui-icon-notext .ui-icon {
-	padding: 0;
-	width: 2.1em;
-	height: 2.1em;
-	text-indent: -9999px;
-	white-space: nowrap;
-
-}
-
-input.ui-button.ui-icon-notext .ui-icon {
-	width: auto;
-	height: auto;
-	text-indent: 0;
-	white-space: normal;
-	padding: .4em 1em;
-}
-
-/* workarounds */
-/* Support: Firefox 5 - 125+ */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-controlgroup {
-	vertical-align: middle;
-	display: inline-block;
-}
-.ui-controlgroup > .ui-controlgroup-item {
-	float: left;
-	margin-left: 0;
-	margin-right: 0;
-}
-.ui-controlgroup > .ui-controlgroup-item:focus,
-.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
-	z-index: 9999;
-}
-.ui-controlgroup-vertical > .ui-controlgroup-item {
-	display: block;
-	float: none;
-	width: 100%;
-	margin-top: 0;
-	margin-bottom: 0;
-	text-align: left;
-}
-.ui-controlgroup-vertical .ui-controlgroup-item {
-	box-sizing: border-box;
-}
-.ui-controlgroup .ui-controlgroup-label {
-	padding: .4em 1em;
-}
-.ui-controlgroup .ui-controlgroup-label span {
-	font-size: 80%;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
-	border-left: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
-	border-top: none;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
-	border-right: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
-	border-bottom: none;
-}
-
-/* Spinner specific style fixes */
-.ui-controlgroup-vertical .ui-spinner-input {
-	width: calc( 100% - 2.4em );
-}
-.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
-	border-top-style: solid;
-}
-
-.ui-checkboxradio-label .ui-icon-background {
-	box-shadow: inset 1px 1px 1px #ccc;
-	border-radius: .12em;
-	border: none;
-}
-.ui-checkboxradio-radio-label .ui-icon-background {
-	width: 16px;
-	height: 16px;
-	border-radius: 1em;
-	overflow: visible;
-	border: none;
-}
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
-	background-image: none;
-	width: 8px;
-	height: 8px;
-	border-width: 4px;
-	border-style: solid;
-}
-.ui-checkboxradio-disabled {
-	pointer-events: none;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-
-/* Icons */
-.ui-datepicker .ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-	left: .5em;
-	top: .3em;
-}
-.ui-dialog {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-n {
-	height: 2px;
-	top: 0;
-}
-.ui-dialog .ui-resizable-e {
-	width: 2px;
-	right: 0;
-}
-.ui-dialog .ui-resizable-s {
-	height: 2px;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-w {
-	width: 2px;
-	left: 0;
-}
-.ui-dialog .ui-resizable-se,
-.ui-dialog .ui-resizable-sw,
-.ui-dialog .ui-resizable-ne,
-.ui-dialog .ui-resizable-nw {
-	width: 7px;
-	height: 7px;
-}
-.ui-dialog .ui-resizable-se {
-	right: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-sw {
-	left: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-ne {
-	right: 0;
-	top: 0;
-}
-.ui-dialog .ui-resizable-nw {
-	left: 0;
-	top: 0;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-draggable-handle {
-	touch-action: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-selectable {
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-text {
-	display: block;
-	margin-right: 20px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-selectmenu-button.ui-button {
-	text-align: left;
-	white-space: nowrap;
-	width: 14em;
-}
-.ui-selectmenu-icon.ui-icon {
-	float: right;
-	margin-top: 0;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: pointer;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-sortable-handle {
-	touch-action: none;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: .222em 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 2em;
-}
-.ui-spinner-button {
-	width: 1.6em;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top-style: none;
-	border-bottom-style: none;
-	border-right-style: none;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}

web/admin/item/jquery-ui/jquery-ui.theme.css

@@ -1,439 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.14.2
- * https://jqueryui.com
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license.
- * https://jquery.org/license
- *
- * https://api.jqueryui.com/category/theming/
- *
- * To view and modify this theme, visit https://jqueryui.com/themeroller/?bgColorDefault=%23f6f6f6&borderColorDefault=%23c5c5c5&fcDefault=%23454545&bgColorHover=%23ededed&borderColorHover=%23cccccc&fcHover=%232b2b2b&bgColorActive=%23007fff&borderColorActive=%23003eff&fcActive=%23ffffff&bgColorHeader=%23e9e9e9&borderColorHeader=%23dddddd&fcHeader=%23333333&bgColorContent=%23ffffff&borderColorContent=%23dddddd&fcContent=%23333333&bgColorHighlight=%23fffa90&borderColorHighlight=%23dad55e&fcHighlight=%23777620&bgColorError=%23fddfdf&borderColorError=%23f1a899&fcError=%235f3f3f&bgColorOverlay=%23aaaaaa&opacityOverlay=.3&bgColorShadow=%23666666&opacityShadow=.3&offsetTopShadow=0px&offsetLeftShadow=0px&thicknessShadow=5px&cornerRadiusShadow=8px&fsDefault=1em&ffDefault=Arial%2CHelvetica%2Csans-serif&fwDefault=normal&cornerRadius=3px&bgTextureDefault=flat&bgTextureHover=flat&bgTextureActive=flat&bgTextureHeader=flat&bgTextureContent=flat&bgTextureHighlight=flat&bgTextureError=flat&bgTextureOverlay=flat&bgTextureShadow=flat&bgImgOpacityDefault=75&bgImgOpacityHover=75&bgImgOpacityActive=65&bgImgOpacityHeader=75&bgImgOpacityContent=75&bgImgOpacityHighlight=55&bgImgOpacityError=95&bgImgOpacityOverlay=0&bgImgOpacityShadow=0&iconColorActive=%23ffffff&iconColorContent=%23444444&iconColorDefault=%23777777&iconColorError=%23cc0000&iconColorHeader=%23444444&iconColorHighlight=%23777620&iconColorHover=%23555555&opacityOverlayPerc=30&opacityShadowPerc=30&bgImgUrlActive=&bgImgUrlContent=&bgImgUrlDefault=&bgImgUrlError=&bgImgUrlHeader=&bgImgUrlHighlight=&bgImgUrlHover=&bgImgUrlOverlay=&bgImgUrlShadow=&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&bgDefaultRepeat=&bgHoverRepeat=&bgActiveRepeat=&bgHeaderRepeat=&bgContentRepeat=&bgHighlightRepeat=&bgErrorRepeat=&bgOverlayRepeat=&bgShadowRepeat=&bgDefaultYPos=&bgHoverYPos=&bgActiveYPos=&bgHeaderYPos=&bgContentYPos=&bgHighlightYPos=&bgErrorYPos=&bgOverlayYPos=&bgShadowYPos=&bgDefaultXPos=&bgHoverXPos=&bgActiveXPos=&bgHeaderXPos=&bgContentXPos=&bgHighlightXPos=&bgErrorXPos=&bgOverlayXPos=&bgShadowXPos=
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget.ui-widget-content {
-	border: 1px solid #c5c5c5;
-}
-.ui-widget-content {
-	border: 1px solid #dddddd;
-	background: #ffffff;
-	color: #333333;
-}
-.ui-widget-content a {
-	color: #333333;
-}
-.ui-widget-header {
-	border: 1px solid #dddddd;
-	background: #e9e9e9;
-	color: #333333;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #333333;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default,
-.ui-button,
-
-/* We use html here because we need a greater specificity to make sure disabled
-works properly when clicked or hovered */
-html .ui-button.ui-state-disabled:hover,
-html .ui-button.ui-state-disabled:active {
-	border: 1px solid #c5c5c5;
-	background: #f6f6f6;
-	font-weight: normal;
-	color: #454545;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited,
-a.ui-button,
-a:link.ui-button,
-a:visited.ui-button,
-.ui-button {
-	color: #454545;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus,
-.ui-button:hover,
-.ui-button:focus {
-	border: 1px solid #cccccc;
-	background: #ededed;
-	font-weight: normal;
-	color: #2b2b2b;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited,
-a.ui-button:hover,
-a.ui-button:focus {
-	color: #2b2b2b;
-	text-decoration: none;
-}
-
-.ui-visual-focus {
-	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active,
-a.ui-button:active,
-.ui-button:active,
-.ui-button.ui-state-active:hover {
-	border: 1px solid #003eff;
-	background: #007fff;
-	font-weight: normal;
-	color: #ffffff;
-}
-.ui-icon-background,
-.ui-state-active .ui-icon-background {
-	border: #003eff;
-	background-color: #ffffff;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #ffffff;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-	color: #777620;
-}
-.ui-state-checked {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #777620;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #f1a899;
-	background: #fddfdf;
-	color: #5f3f3f;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #5f3f3f;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #5f3f3f;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	background-image: none;
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon,
-.ui-button:hover .ui-icon,
-.ui-button:focus .ui-icon {
-	background-image: url("images/ui-icons_555555_256x240.png");
-}
-.ui-state-active .ui-icon,
-.ui-button:active .ui-icon {
-	background-image: url("images/ui-icons_ffffff_256x240.png");
-}
-.ui-state-highlight .ui-icon,
-.ui-button .ui-state-highlight.ui-icon {
-	background-image: url("images/ui-icons_777620_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cc0000_256x240.png");
-}
-.ui-button .ui-icon {
-	background-image: url("images/ui-icons_777777_256x240.png");
-}
-
-/* positioning */
-/* Three classes needed to override `.ui-button:hover .ui-icon` */
-.ui-icon-blank.ui-icon-blank.ui-icon-blank {
-	background-image: none;
-}
-.ui-icon-caret-1-n { background-position: 0 0; }
-.ui-icon-caret-1-ne { background-position: -16px 0; }
-.ui-icon-caret-1-e { background-position: -32px 0; }
-.ui-icon-caret-1-se { background-position: -48px 0; }
-.ui-icon-caret-1-s { background-position: -65px 0; }
-.ui-icon-caret-1-sw { background-position: -80px 0; }
-.ui-icon-caret-1-w { background-position: -96px 0; }
-.ui-icon-caret-1-nw { background-position: -112px 0; }
-.ui-icon-caret-2-n-s { background-position: -128px 0; }
-.ui-icon-caret-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -65px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -65px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 3px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa;
-	opacity: .3;
-}
-.ui-widget-shadow {
-	box-shadow: 0px 0px 5px #666666;
-}

web/admin/item/jquery-ui/package.json

@@ -1,76 +0,0 @@
-{
-	"name": "jquery-ui",
-	"title": "jQuery UI",
-	"description": "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.",
-	"version": "1.14.2",
-	"homepage": "https://jqueryui.com",
-	"author": {
-		"name": "OpenJS Foundation and other contributors",
-		"url": "https://github.com/jquery/jquery-ui/blob/1.14.2/AUTHORS.txt"
-	},
-	"main": "ui/widget.js",
-	"maintainers": [
-		{
-			"name": "Jörn Zaefferer",
-			"email": "joern.zaefferer@gmail.com",
-			"url": "https://bassistance.de"
-		},
-		{
-			"name": "Mike Sherov",
-			"email": "mike.sherov@gmail.com",
-			"url": "https://mike.sherov.com"
-		},
-		{
-			"name": "TJ VanToll",
-			"email": "tj.vantoll@gmail.com",
-			"url": "https://www.tjvantoll.com"
-		},
-		{
-			"name": "Felix Nagel",
-			"email": "info@felixnagel.com",
-			"url": "https://www.felixnagel.com"
-		},
-		{
-			"name": "Alex Schmitz",
-			"email": "arschmitz@gmail.com",
-			"url": "https://github.com/arschmitz"
-		}
-	],
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/jquery/jquery-ui.git"
-	},
-	"bugs": {
-		"url": "https://github.com/jquery/jquery-ui/issues"
-	},
-	"license": "MIT",
-	"scripts": {
-		"build": "grunt build",
-		"lint": "grunt lint",
-		"test:server": "jtr serve",
-		"test:unit": "jtr",
-		"test": "grunt && npm run test:unit -- --headless"
-	},
-	"dependencies": {
-		"jquery": ">=1.12.0 <5.0.0"
-	},
-	"devDependencies": {
-		"@swc/core": "1.15.2",
-		"commitplease": "3.2.0",
-		"eslint-config-jquery": "3.0.2",
-		"globals": "16.5.0",
-		"grunt": "1.6.1",
-		"grunt-bowercopy": "1.2.5",
-		"grunt-compare-size": "0.4.2",
-		"grunt-contrib-concat": "2.1.0",
-		"grunt-contrib-csslint": "2.0.0",
-		"grunt-contrib-requirejs": "1.0.0",
-		"grunt-eslint": "26.0.0",
-		"grunt-git-authors": "3.2.0",
-		"grunt-html": "18.0.2",
-		"jquery-test-runner": "0.2.8",
-		"load-grunt-tasks": "5.1.0",
-		"rimraf": "6.1.0"
-	},
-	"keywords": []
-}