From c033a7668c0bdeb55de9c7456a7f96c118d6f422 Mon Sep 17 00:00:00 2001 From: ukityeamyai <yamyai.8084@gmail.com> Date: Sun, 9 Apr 2023 23:16:24 +0700 Subject: [PATCH] finish --- .../Controllers/ApproveMembersController.php | 8 +- app/Http/Controllers/CheckMoneyController.php | 6 +- .../Controllers/CreateMemberController.php | 6 +- .../Controllers/EvidentDepositController.php | 6 +- app/Http/Controllers/FormController.php | 8 +- app/Http/Controllers/HomeAdminController.php | 6 +- app/Http/Controllers/RegisterController.php | 18 +- app/Http/Controllers/UserController.php | 5 + app/Models/Address.php | 7 +- app/Models/Member.php | 32 +- app/Models/Receipt.php | 28 +- .../Register/v_register_page1.blade.php | 30 +- .../Register/v_register_page2.blade.php | 349 +++++++----------- .../Register/v_register_page3.blade.php | 10 + .../Register/v_register_page4.blade.php | 10 +- .../Manage_member/v_approve_member.blade.php | 20 +- .../Manage_member/v_update_member.blade.php | 2 +- resources/views/Admin/v_admin_home.blade.php | 13 +- .../views/Admin/v_admin_report.blade.php | 2 +- .../views/Member/v_member_home.blade.php | 4 + .../Member/v_member_proof_tranfer.blade.php | 9 + .../views/layouts/v_navbar_admin.blade.php | 13 +- routes/web.php | 5 +- 23 files changed, 342 insertions(+), 255 deletions(-) diff --git a/app/Http/Controllers/ApproveMembersController.php b/app/Http/Controllers/ApproveMembersController.php index 8298e88e..194323ce 100644 --- a/app/Http/Controllers/ApproveMembersController.php +++ b/app/Http/Controllers/ApproveMembersController.php @@ -4,11 +4,15 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; - + /* + * ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */ class ApproveMembersController extends Controller { public function approvemembers(){ return view('Admin/ApproveMembers'); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/CheckMoneyController.php b/app/Http/Controllers/CheckMoneyController.php index 76c9aa09..a76db9c9 100644 --- a/app/Http/Controllers/CheckMoneyController.php +++ b/app/Http/Controllers/CheckMoneyController.php @@ -4,7 +4,11 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; - + /* +* ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */ class CheckMoneyController extends Controller { public function checkmoney(){ diff --git a/app/Http/Controllers/CreateMemberController.php b/app/Http/Controllers/CreateMemberController.php index da527336..e1318c92 100644 --- a/app/Http/Controllers/CreateMemberController.php +++ b/app/Http/Controllers/CreateMemberController.php @@ -4,7 +4,11 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; - + /* +* ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */ class CreateMemberController extends Controller { public function CreateMember(){ diff --git a/app/Http/Controllers/EvidentDepositController.php b/app/Http/Controllers/EvidentDepositController.php index c1d3b680..d659406b 100644 --- a/app/Http/Controllers/EvidentDepositController.php +++ b/app/Http/Controllers/EvidentDepositController.php @@ -4,7 +4,11 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; - + /* +* ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */ class EvidentDepositController extends Controller { public function EvidentDeposit(){ diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php index 8c71a608..61c8efdb 100644 --- a/app/Http/Controllers/FormController.php +++ b/app/Http/Controllers/FormController.php @@ -4,7 +4,11 @@ use Illuminate\Http\Request; -class FormController extends Controller + /* +* ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */class FormController extends Controller { public function index() { @@ -15,7 +19,7 @@ public function submit(Request $request) { // รับข้อมูลจากฟอร์ม $data = $request->all(); - + // ส่งข้อมูลไปยังหน้า view อื่นๆ return view('submit', compact('data')); } diff --git a/app/Http/Controllers/HomeAdminController.php b/app/Http/Controllers/HomeAdminController.php index e5e49927..7df9288f 100644 --- a/app/Http/Controllers/HomeAdminController.php +++ b/app/Http/Controllers/HomeAdminController.php @@ -4,7 +4,11 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; - + /* +* ผิด codeing standart +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 + */ class HomeAdminController extends Controller { public function HomeAdmin(){ diff --git a/app/Http/Controllers/RegisterController.php b/app/Http/Controllers/RegisterController.php index 4c8d420f..b9410e40 100644 --- a/app/Http/Controllers/RegisterController.php +++ b/app/Http/Controllers/RegisterController.php @@ -10,7 +10,10 @@ class RegisterController extends Controller { /* - +* Register +* Register member page 1 +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-08 */ public function Register_page1(){ return view('Admin/Manage_member/Register/v_register_page1'); @@ -20,7 +23,7 @@ public function Register_page1(){ */ - + public function Register_page2(Request $request){ $member = new Member(); $member->mem_prefix_th = $request->input('mem-prefix-th'); @@ -45,7 +48,12 @@ public function Register_page2(Request $request){ /* - */ +* Register +* Register member page 2 +* @author : Ukit Yaemyai 64160174 +* @Create Date : 2023-04-08 + */ + public function Register_page3(Request $request){ $member = new Member(); @@ -66,7 +74,7 @@ public function Register_page3(Request $request){ $member->mem_confirm_email = $request->input('mem-confirm-email'); $member->mem_phone_number = $request->input('mem-phone-number'); $member->insert_new_member(); - + $mem_birthday = $request->input('birthday'); $mem_age = $request->input('mem-age'); $mem_lawyer_relation = $request->input('mem-lawyer-relation'); @@ -92,7 +100,7 @@ public function Register_page3(Request $request){ $dyn_phonenumber = $request->input('phonenumber'); return view('Admin/Manage_member/Register/v_register_page3'); - + } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index c0b73a34..c2071cb2 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -5,6 +5,11 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; +/* +* user +* @author : Wilaiwan Runnabud 64160073 +* @Create Date : 2023-04-09 +*/ class UserController extends Controller { public function User_home(){ diff --git a/app/Models/Address.php b/app/Models/Address.php index 4d229d7c..448d5b44 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -3,6 +3,11 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +/* + *address model + @author : Dechatorn Prajit 64160295 + @Create Date : 2023-04-04 + */ /** * @property integer $id @@ -18,7 +23,7 @@ class Address extends Model { /** * The table associated with the model. - * + * * @var string */ protected $table = 'Address'; diff --git a/app/Models/Member.php b/app/Models/Member.php index f7603dd3..7a13481f 100644 --- a/app/Models/Member.php +++ b/app/Models/Member.php @@ -7,7 +7,11 @@ use Illuminate\Support\Facades\DB; use Illuminate\Http\Request; - +/* + *Member model + @author : Dechatorn Prajit 64160295 + @Create Date : 2023-04-04 + */ class Member extends Model { use HasFactory; @@ -36,6 +40,12 @@ class Member extends Model 'mem_balance' ]; + + /* + *login_auth + @author : Dechatorn Prajit 64160295 + @Create Date : 2023-04-04 + */ public function login_auth($id_card, $pass){ $user = DB::table('Member')->select('id', 'mem_id_card','mem_type', 'mem_fname_th', 'mem_lname_th', 'mem_status') // Query ข้อมูลจาก Database @@ -45,11 +55,21 @@ public function login_auth($id_card, $pass){ return $user; } + /* + *insert_new_member + *@author : Ukit Yeamyai 64160174 + *@Create Date : 2023-04-04 + */ public function insert_new_member(){ DB::statement('INSERT INTO MEMBER(mem_id_card,mem_prefix_th, mem_prefix_en,mem_fname_th, mem_fname_en, mem_lname_th, mem_lname_en, mem_birthday, mem_lawyer_type, mem_license, mem_lawyer_affiliation, mem_lawyer_relation, mem_email, mem_phone_number, mem_balance, `password`, address_id) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)' , [$this->mem_id_card, $this->mem_prefix_th, $this->mem_prefix_en, $this->mem_fname_th, $this->mem_fname_en, $this->mem_lname_th, $this->mem_lname_en, $this->mem_birthday, $this->mem_lawyer_type,$this->mem_license, $this->mem_lawyer_affiliation, $this->mem_lawyer_relation, $this->mem_email, $this->mem_phone_number, $this->mem_balance, $this->password, $this->address_id ] ); } + /* + *get_all_user + *@author : wilairak Prathummat 64160072 + *@Create Date : 2023-04-04 + */ public function get_all_user(){ $user = DB::table('Member')->select()->get(); return $user; @@ -59,10 +79,20 @@ public function get_member_detail($id) { return DB::table('Member')->join('Address', 'Member.address_id', '=', 'Address.id')->where('Member.id', '=', $id)->get(); } + /* + *approve_member + *@author : wilairak Prathummat 64160072 + *@Create Date : 2023-04-04 + */ public function approve_member($id) { DB::statement('UPDATE Member SET mem_status = 1 WHERE id = ?', [$id]); } + /* + *reject_member + *@author : wilairak Prathummat 64160072 + *@Create Date : 2023-04-04 + */ public function reject_member($id) { DB::statement('UPDATE Member SET mem_status = 2 WHERE id = ?', [$id]); } diff --git a/app/Models/Receipt.php b/app/Models/Receipt.php index 5fbbfb3b..79c849fb 100644 --- a/app/Models/Receipt.php +++ b/app/Models/Receipt.php @@ -1,7 +1,11 @@ <?php namespace App\Models; - +/* + *Member model + @author : Dechatorn Prajit 64160295 + @Create Date : 2023-04-04 + */ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; @@ -29,7 +33,11 @@ class Receipt extends Model * @var array */ protected $fillable = ['rec_name', 'rec_amount', 'rec_date', 'rec_time', 'rec_img', 'mem_id']; - + /* + * Insert_receipt + * @author : Wilaiwan Runnabud 64160073 + * @Create Date : 2023-04-09 + */ public function Insert_receipt() { // echo $this->rec_date_and_time; DB::statement('INSERT INTO Receipt(rec_name, rec_amount, rec_date, rec_time, rec_img, rec_status, mem_id) @@ -45,19 +53,33 @@ public function Insert_receipt() { ]); } - + /* + *get_recipt + *@author : Ukit Yeamyai 64160174 + *@Create Date : 2023-04-09 + */ public function get_recipt() { $data = DB::table('Receipt')->select()->get(); return $data; } + /* + *accept + *@author : Ukit Yeamyai 64160174 + *@Create Date : 2023-04-09 + */ public function accept($id_rec, $id_mem, $money) { DB::table('Receipt')->where(['id'=>$id_rec])->update(['rec_status'=> 1]); DB::table('Member')->where(['id'=>$id_mem])->update(['mem_balance'=> $money]); } + /* + *denied + *@author : Ukit Yeamyai 64160174 + *@Create Date : 2023-04-09 + */ public function denied($id_rec) { DB::table('Receipt')->where(['id'=>$id_rec])->update(['rec_status'=> 2]); diff --git a/resources/views/Admin/Manage_member/Register/v_register_page1.blade.php b/resources/views/Admin/Manage_member/Register/v_register_page1.blade.php index bc7dc9d8..25219423 100644 --- a/resources/views/Admin/Manage_member/Register/v_register_page1.blade.php +++ b/resources/views/Admin/Manage_member/Register/v_register_page1.blade.php @@ -1,5 +1,15 @@ @extends('layouts.v_navbar_admin') @section('navbar_admin') + +<!-- +* Register +* Register member page 1 +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-03 +* @Update Data : 2023-04-04 Ukit Yeamyai 64160174 +* edit format html css and input name +--> + <!DOCTYPE html> <html> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" @@ -9,20 +19,19 @@ </script> <head> + <meta name="viewport" content="width=device-width, initial-scale=1" /> <!-- Bootstrap 5 - @author: - Carate --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css" integrity="sha512-jRcyS0JzoOe9Mq3OEn5Q+U67/l7o+f+B2dG1mVWmHJ+ud7M9XmFmB7GJj6o4b4Yl+SGoSyKkfcf1FbzN1Sd9zA==" crossorigin="anonymous" referrerpolicy="no-referrer" /> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Prompt"> <link rel="stylesheet" href="css/Admin/Manage_member/Register/page_1.css"> - <title>CSA</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> - {{-- <style> + <style> .change_display { display: contents; } @@ -56,13 +65,11 @@ left: 4px; } - - </style> --}} + </style> </head> <body> - <br> <br> <br> @@ -186,7 +193,7 @@ <div class="row mt-3"> <div class="col-12 text-end m-3"> - <button id="btn-sumit1" class="btn btn-primary" type="submit">ถัดไป</button> + <button id="btn-sumit1" class="btn btn-primary" type="submit"> ถัดไป</button> </div> </div> </form> @@ -198,6 +205,10 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script> <script> + /* + * @author : Chaiyapat Boonseng 64160159 + * + */ $.Thailand({ $district: $('#district'), // input ของตำบล $amphoe: $('#amphoe'), // input ของอำเภอ @@ -206,7 +217,4 @@ }); </script> - - -</script> @endsection diff --git a/resources/views/Admin/Manage_member/Register/v_register_page2.blade.php b/resources/views/Admin/Manage_member/Register/v_register_page2.blade.php index cb38edc3..5b83a7d5 100644 --- a/resources/views/Admin/Manage_member/Register/v_register_page2.blade.php +++ b/resources/views/Admin/Manage_member/Register/v_register_page2.blade.php @@ -1,3 +1,15 @@ +@extends('layouts.v_navbar_admin') +@section('navbar_admin') + +<!-- +* Register +* Register member page 2 +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-03 +* @Update Data : 2023-04-04 Ukit Yeamyai 64160174 +* edit format html css and input name +--> + <!DOCTYPE html> <html> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" @@ -17,233 +29,136 @@ </head> <body> - <!-- - หน้าลงทะเบียนสมาชิก - --> <div class="container"> - <div class="row"> - <div class="card col-md-12 p-3"> - <div class="row"> - <div class="col-md-4"> - <img src="w-50" alt="icon/regicter/register.png"> - </div> - <div class="col-md-8"> - <div class="card-block"> - <h1 class="card-title">ลงทะเบียนสมาชิก</h1> - </div> - </div> - </div> + <form class="row border border-primary" method="POST" action="{{url('/Register_page3')}}"> + @csrf + <div class="a m-5"> + ได้ทราบข้อบังคับของการฌาปนกิจสงเคราะห์สภาทนายความ และเห็นชอบด้วย จึงขอแจ้งความประสงค์สมัครเข้าเป็นสมาชิก + <br> + การฌาปนกิจสงเคราะห์สภาทนายความและขอให้ถ้อยคำเป็นลายลักษณ์อักษรต่อคณะกรรมการฌาปนกิจสงเคราห์ ดังนี้ </div> - </div> - - <div style="display: flex; justify-content: center;"> - <form id="regis_2" class="box_form"> - @csrf - <div class="regis_text"> - <div> - ได้ทราบข้อบังคับของการฌาปนกิจสงเคราะห์สภาทนายความและเห็นชอบด้วยจึงขอแจ้งความประสงค์สมัครเข้าเป็นสมาชิก - การฌาปนกิจสงเคราะห์สภาทนายความ - และขอให้ถ้อยคำเป็นลายลักษณ์อักษรต่อคณะกรรมการฌาปนกิจสงเคราห์ ดังนี้ - </div> - </div> - - <div> - <center> - ............................................................................................................ - </center> - </div> - <div class="box_all"> - <div class="box_all"> - <!-- - อายุของผู้กรอกข้อมูล - --> - <div> - ข้อ 1. ข้าพเจ้า เกิดวันที่ - </div> - <div> - <input type="date" id="my_birthday" name="my_birthday"> - </div> - </div> - - <div class="box_age"> - <div class="box_age"> - ปัจจุบันอายุ - </div> - <div> - <!-- - ดึงข้อมูลจากdatabase - --> - <input type="text" class="form-control" id="my_age" name="my_age"> - </div> - </div> - </div> - <div> - <center> - ............................................................................................................ - </center> - </div> - - <div class="box_content"> - <div> - ข้อ 2. ข้าพเจ้า - </div> - - <div> - <div class="box_all"> - <div class="box_content"> - <div class="regis_text"> - <div> - 2.1 เป็นทนายความประเภท - </div> - </div> - </div> - - <div class="box_content"> - <div class="form-check" id="radio_sel" onchange="resetSpanNumber1()"> - <input class="form-check-input" type="radio" name="mem-lawyer-relation" - value="ตลอดชีพ"> - ตลอดชีพ - {{-- <label class="form-check-label" for="lawyer-relation"> ตลอดชีพ </label> --}} - </div> - </div> + <div class="a1"> + ข้อ 1. ข้าพเจ้า เกิดวันที่ + <input type="date" id="mem-birthday" name="mem-birthday"> + ปัจจุบันอายุ + <input type="text" class="form-control" id="mem-age" name="mem-age"> + </div> - <div class="box_content"> - <div class="form-check" id="radio_sel" onchange="resetSpanNumber1()"> + ข้อ 2. ข้าพเจ้า + + <div class="a2"> + <p class="text"> + <div class="a21 mx-5"> + <label for="text" class="form-label"> + 2.1 เป็นทนายความประเภท + </label> + <div class="form-check" id="radio_sel" onchange="resetSpanNumber1()"> + <input class="form-check-input" type="radio" name="mem-lawyer-relation" value="ตลอดชีพ"> + ตลอดชีพ + {{-- <label class="form-check-label" for="lawyer-relation"> ตลอดชีพ </label> --}} + + <br> <input class="form-check-input" type="radio" name="mem-lawyer-relation" - value="สองปี"> - สองปี + value="สองปี"> สองปี {{-- <label class="form-check-label" for="lawyer-relation"> สองปี </label> --}} - </div> - </div> - - <div class="box_content"> - <div> - <div> - ใบอนุญาติเลขที่ - </div> - </div> - </div> - </div> - </div> - - <div> - <div class="box_all"> - <div class="box_content"> - <div class="regis_text"> - <div> - 2.2 เป็นพนักงานประจำสภาทนายความ สังกัด - </div> - </div> - <div class="box_regis"> - <div> - <input style="height: 30px;" type="text" class="form-control" - id="lawyer-affiliation" name="lawyer-affiliation"> - </div> - </div> - </div> </div> </div> + </p> + </div> - <div> - <div class="box_family"> - <div> - 2.3 เป็นบุคคลในครอบครัวของ - </div> - <div> - <div class="dropdown show"> - <select name="prefix-th" id="prefix" class="form-select"> - <option class="value" hidden>คำนำหน้า</option> - <option value="Boy">เด็กชาย</option> - <option value="Girls">เด็กหญิง</option> - <option value="Mr">นาย</option> - <option value="Mrs">นาง</option> - <option value="Miss">นางสาว</option> - </select> - </div> - </div> - - <div> - <input type="text" class="form-control" id="username" name="username"> - </div> - </div> - </div> - <div class="f_number"> - <div> - ใบอนุญาตทนายความเลขที่ - </div> + <div class="b21 ms-4"> + ใบอนุญาตเลขที่ + </div> + <div class="a212 ms-4"> + <input type="text" class="form-control" id="license" name="license"> + <a>/</a> + <input type="text" class="form-control" id="yeear-license" name="yeear-license"> + </div> + </div> + </p> + </div> + <div class="a3 mx-5"> + 2.2 เป็นพนักงานประจำสภาทนายความสังกัด + <input type="text" class="form-control" id="lawyer-affiliation" name="lawyer-affiliation"> - <div> - <input type="text" class="form-control" id="fist-number" name="fist-number"> - <a>/</a> - <input type="text" class="form-control" id="last-number" name="last-number"> - </div> - </div> + </div> + <div class="a4 mx-5"> + 2.3 เป็นบุคคลในครอบครัวของ + <div class="col-md-2"> + <div class="dropdown show"> + <select name="prefix-th" id="prefix" class="form-select"> + <option class="value" hidden>คำนำหน้า</option> + <option value="Boy">เด็กชาย</option> + <option value="Girls">เด็กหญิง</option> + <option value="Mr">นาย</option> + <option value="Mrs">นาง</option> + <option value="Miss">นางสาว</option> + </select> + </div> + </div> + <input type="text" class="form-control" id="username" name="username"> + </div> - <div> - <center> - ............................................................................................................ - </center> - </div> + <div class="a5"> + ใบอนุญาตทนายความเลขที่ + <input type="text" class="form-control" id="fist-disbarment" name="fist-disbarment"> + <a>/</a> + <input type="text" class="form-control" id="last-disbarment" name="last-disbarment"> + โดยเกี่ยวข้องเป็น + <input type="text" class="form-control" id="lawyer_relation" name="lawyer_relation"> + </div> + <div class="mt-2"> + ข้อ 3. เมื่อข้าพเจ้าถึงแก่ความตาย ข้อให้คณะกรรมการจ่ายเงินสงเคราะห์ ให้แก่ + </div> - <div> - <div> - ข้อ 3. เมื่อข้าพเจ้าถึงแก่ความตาย ข้อให้คณะกรรมการจ่ายเงินสงเคราะห์ ให้แก่ - </div> + <section class="section-address"> + <div class="div-address pt-3" id="div-address-1"> + <div class="a6"> + 3.1 ชื่อ + <input type="text" class="form-control" id="name" name="name"> + เกี่ยวข้องเป็น + <input type="text" class="form-control" id="relate" name="relate"> + </div> + <div class="a7"> + บ้านเลขที่ + <input type="text" class="form-control" id="home-number" name="home-number"> + หมู่ที่ + <input type="text" class="form-control" id="group" name="group"> + หมู่บ้าน + <input type="text" class="form-control" id="village" name="village"> + ตรอก/ซอย + <input type="text" class="form-control" id="alley" name="alley"> + </div> + <div class="a8"> + ถนน + <input type="text" class="form-control" id="rode" name="role"> + ตำบล/แขวง + <input type="text" class="form-control" id="sub-district" name="sub-district"> + อำเภอ/เขต + <input type="text" class="form-control" id="district" name="district"> + </div> + <div class="a9"> + จังหวัด + <input type="text" class="form-control" id="country" name="country"> + โทรศัพท์ที่สามารถติดต่อได้ + <input type="text" class="form-control" id="phonenumber" name="phonenumber"> + </div> + </div> + </section> - <section class="section-address"> - <div class="div-address pt-3" id="div-address-1"> + <button class="btn btn-primary" type="button" onClick="addDivAddress()"> + เพิ่มข้อมูล + </button> - <div> - <div> - 3.1 ชื่อ - </div> - <div> - <input type="text" class="form-control" id="name" name="name"> - </div> + <div class="col-12 text-end"> + <button id="btn-back" class="btn btn-secondary" role="button">ย้อนกลับ</button> + <button class="btn btn-primary" type="submit"> ถัดไป </button> + </div> - เกี่ยวข้องเป็น - <input type="text" class="form-control" id="relate" name="relate"> - </div> - <div class="a7"> - บ้านเลขที่ - <input type="text" class="form-control" id="home-number" name="home-number"> - หมู่ที่ - <input type="text" class="form-control" id="group" name="group"> - หมู่บ้าน - <input type="text" class="form-control" id="village" name="village"> - ตรอก/ซอย - <input type="text" class="form-control" id="alley" name="alley"> - </div> - <div class="a8"> - ถนน - <input type="text" class="form-control" id="rode" name="role"> - ตำบล/แขวง - <input type="text" class="form-control" id="sub-district" name="sub-district"> - อำเภอ/เขต - <input type="text" class="form-control" id="district" name="district"> - </div> - </section> - <div class="a9"> - จังหวัด - <input type="text" class="form-control" id="country" name="country"> - โทรศัพท์ที่สามารถติดต่อได้ - <input type="text" class="form-control" id="phonenumber" name="phonenumber"> - </div> - </div> - </section> - </div> - <button class="btn btn-primary" type="button" onClick="addDivAddress()"> - เพิ่มข้อมูล - </button> - <div class="col-12 text-end"> - <button id="btn-back" class="btn btn-secondary" role="button">ย้อนกลับ</button> - <button class="btn btn-primary" type="submit"> ถัดไป </button> - </div> - </form> - </div> + </form> </div> <script> @@ -282,7 +197,17 @@ function addDivAddress() { html += '<button type="button" onClick="deleteDivAddress(' + row + ')">ลบ</button>'; html += '</div>' - function resetSpanNumber() { + $('.section-address').append(html); + } + + function deleteDivAddress(row_number) { + $("#div-address-" + row_number).remove(); + resetSpanNumber(); + } + + function resetSpanNumber() { + let elem = $(".span_number"); + for (let i = 0; i < elem.length; i++) { $('.span_number').eq(i).text(i + 2); } } @@ -292,9 +217,11 @@ function resetSpanNumber1(event) { console.log(rates); } + const form = document.querySelector("form"); </script> </body> </html> +@endsection diff --git a/resources/views/Admin/Manage_member/Register/v_register_page3.blade.php b/resources/views/Admin/Manage_member/Register/v_register_page3.blade.php index a19e40d6..c1d0553e 100644 --- a/resources/views/Admin/Manage_member/Register/v_register_page3.blade.php +++ b/resources/views/Admin/Manage_member/Register/v_register_page3.blade.php @@ -1,6 +1,16 @@ @extends('layouts.v_navbar_admin') @section('navbar_admin') + +<!-- +* Register +* Register member page 3 +* @author : Chaiyapat Boonseng 64160159 +* @Create Date : 2023-04-03 +* @Update Data : 2023-04-04 Ukit Yeamyai 64160174 +* edit format html css and input name +--> + <!DOCTYPE html> <html> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" diff --git a/resources/views/Admin/Manage_member/Register/v_register_page4.blade.php b/resources/views/Admin/Manage_member/Register/v_register_page4.blade.php index ba08bf4a..d865078c 100644 --- a/resources/views/Admin/Manage_member/Register/v_register_page4.blade.php +++ b/resources/views/Admin/Manage_member/Register/v_register_page4.blade.php @@ -1,5 +1,13 @@ @extends('layouts.v_navbar_admin') @section('navbar_admin') + +<!-- +* Register +* Register member page 4 +* @author : wilairak Prathummat 64160072 +* @Create Date : 2023-04-03 +--> + <!DOCTYPE html> <head> @@ -15,7 +23,7 @@ href="https://fonts.googleapis.com/css2?family=Kanit:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800&display=swap" rel="stylesheet"> <link rel="stylesheet" href="css/Admin/Register/page_5.css"> - <title>CSA</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> </head> <body> diff --git a/resources/views/Admin/Manage_member/v_approve_member.blade.php b/resources/views/Admin/Manage_member/v_approve_member.blade.php index 1ebf3e74..7d911baa 100644 --- a/resources/views/Admin/Manage_member/v_approve_member.blade.php +++ b/resources/views/Admin/Manage_member/v_approve_member.blade.php @@ -1,9 +1,10 @@ <!-- - *v_approve_member.blade.php - *Display approve member table for admin - *@input : mem_status - *@output : + * v_approve_member.blade.php + * Display approve member table for admin + * @author : wilairak Prathummat 64160072 + * @Create Date : 2023-04-05 --> + @extends('layouts.v_navbar_admin') @section('navbar_admin') <!DOCTYPE html> @@ -30,7 +31,7 @@ <meta charset="UTF-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Approve_member</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> </head> @@ -100,6 +101,13 @@ </thead> <tbody> + <!-- + * Fountion + * @foreach($user_all as $user) + * @author : wilairak Prathummat 64160072 + * @Create Date : 2023-04-03 + --> + @foreach($user_all as $user) <tr> <td class="ps-5">01/01/2566</td> @@ -176,7 +184,6 @@ กำลังโหลดข้อมูล</div> <div class="row m-4"> - <div></div> <div class="col-2">คำนำหน้า <input class="form-control" type="text" id="mem_prefix_th" disabled> @@ -230,6 +237,7 @@ <div class="modal fade" id="exampleModalToggle" aria-hidden="true" aria-labelledby="exampleModalToggleLabel" tabindex="-1"> </div> + <button class="btn btn-primary" data-bs-toggle="modal" role="button" id="approve_btn" onclick="Approve_member()">อนุมัติ</button> <button class="btn btn-danger" data-bs-toggle="modal" role="button" id="reject_btn" diff --git a/resources/views/Admin/Manage_member/v_update_member.blade.php b/resources/views/Admin/Manage_member/v_update_member.blade.php index dbffa312..31ebafc2 100644 --- a/resources/views/Admin/Manage_member/v_update_member.blade.php +++ b/resources/views/Admin/Manage_member/v_update_member.blade.php @@ -7,7 +7,7 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="X-UA-Compatible" content="ie=edge"> - <title>CSA</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> </head> <body> diff --git a/resources/views/Admin/v_admin_home.blade.php b/resources/views/Admin/v_admin_home.blade.php index 40cf460e..6353dc20 100644 --- a/resources/views/Admin/v_admin_home.blade.php +++ b/resources/views/Admin/v_admin_home.blade.php @@ -1,5 +1,15 @@ @extends('layouts.v_navbar_admin') @section('navbar_admin') + + +<!-- +* admin home +* home of admin main +* @author : Dechathon Prajit 64160295 +* @Create Date : 2023-04-06 +* +--> + <!-- Start Content --> <!DOCTYPE html> @@ -16,11 +26,12 @@ <!-- Boxicons CSS --> <link href='https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css' rel='stylesheet'> + <head> <meta charset="UTF-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Document</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> <style> .mt-5,.mt-3{ diff --git a/resources/views/Admin/v_admin_report.blade.php b/resources/views/Admin/v_admin_report.blade.php index a12f4e63..7d5377ef 100644 --- a/resources/views/Admin/v_admin_report.blade.php +++ b/resources/views/Admin/v_admin_report.blade.php @@ -6,7 +6,7 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="X-UA-Compatible" content="ie=edge"> - <title>CSA</title> + <title>ฌาปนกิจสงเคราะห์ สภาทนายความ</title> </head> <body> diff --git a/resources/views/Member/v_member_home.blade.php b/resources/views/Member/v_member_home.blade.php index bff7154b..43e5dc5d 100644 --- a/resources/views/Member/v_member_home.blade.php +++ b/resources/views/Member/v_member_home.blade.php @@ -1,5 +1,8 @@ @extends('layouts.v_navbar_member') @section('navbar_member') + + + <!-- Start Content --> <!DOCTYPE html> @@ -11,6 +14,7 @@ <!-- Boxicons CSS --> <link href='https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css' rel='stylesheet'> + <head> <meta charset="UTF-8"> diff --git a/resources/views/Member/v_member_proof_tranfer.blade.php b/resources/views/Member/v_member_proof_tranfer.blade.php index 5e41a276..6f75a3c2 100644 --- a/resources/views/Member/v_member_proof_tranfer.blade.php +++ b/resources/views/Member/v_member_proof_tranfer.blade.php @@ -1,6 +1,15 @@ @extends('layouts.v_navbar_member') @section('navbar_member') + + +<!-- +* proof tranfer +* tranfer memmber +* @author : Wilaiwan Runnabud 64160073 +* @Create Date : 2023-04-09 +--> + <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> diff --git a/resources/views/layouts/v_navbar_admin.blade.php b/resources/views/layouts/v_navbar_admin.blade.php index b8274dcf..567aeadf 100644 --- a/resources/views/layouts/v_navbar_admin.blade.php +++ b/resources/views/layouts/v_navbar_admin.blade.php @@ -1,3 +1,12 @@ + + +<!-- +* navber +* @author :64160292 +* @Create Date : 2023-04-06 +* +--> + <!DOCTYPE html> <html lang="en"> @@ -38,9 +47,9 @@ </a> </div> <div class="bottom-cotent"> - <a href="{{url('/')}}" class="nav-link"> + <a href="{{url('/')}}" class="nav-link"> <i class='bx bx-log-out icon'></i> - </a> + </a> </div> <div class="sidebar"> diff --git a/routes/web.php b/routes/web.php index bcd07533..7081eecd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,9 +17,8 @@ /* * */ -Route::get('/', function () { - return view('v_welcome'); -}); +Route::get('/welcome', [App\Http\Controllers\UserController::class, +'welcome'])->name('welcome'); /* * -- GitLab