KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kemaskini notis lelong fasa 1

Browse Source
This commit is contained in:
Amirah22
2022-07-04 10:31:40 +08:00
parent bd15f09d15
commit b6e7d8963e
9 changed files with 255 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/NotisController.php
+26
View File
@@ -17,6 +17,7 @@ use App\Models\Resit;
use App\Models\Gadai;
use App\Models\Daerah;
use App\Models\Negeri;
use App\Models\Tetapan;
use Carbon\Carbon;
use PDF;
use DateTime;
@@ -25,6 +26,7 @@ use Excel;
class NotisController extends Controller
{
/**
@@ -158,9 +160,33 @@ class NotisController extends Controller
}
Public function kemaskininotis(Request $request){
$tetapan = Tetapan::where('id','=',1)->first();
// dd($tetapan);
return view('jananotis.kemaskininotis',compact('tetapan'));
}
public function store(Request $request)
{
//create tetapan
$tetapan = Tetapan::find(1);
$tetapan->para2 = $request->para2;
$tetapan->update();
return redirect()->route('jananotis.kemaskininotis')
->with('success','Kemaskini Berjaya');
}
}
composer.json
+2
View File
@@ -7,6 +7,7 @@
"require": {
"php": "^7.3|^8.0",
"barryvdh/laravel-dompdf": "^0.9.0",
"ckeditor/ckeditor": "^4.19",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.4",
"intervention/image": "^2.7",
@@ -14,6 +15,7 @@
"laravel/framework": "^8.65",
"laravel/sanctum": "^2.13",
"laravel/tinker": "^2.5",
"laravelcollective/html": "^6.3",
"php-http/guzzle7-adapter": "^1.0",
"pusher/pusher-php-server": "^7.0",
"spatie/laravel-permission": "^5.3"
composer.lock
Generated
+121 -1
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "1f26af21cdf299942137e16bdee7fbea",
"content-hash": "f73b484268370b115dbf98bbd27f6a22",
"packages": [
{
"name": "asm89/stack-cors",
@@ -188,6 +188,54 @@
],
"time": "2021-08-15T20:50:18+00:00"
},
{
"name": "ckeditor/ckeditor",
"version": "4.19.0",
"source": {
"type": "git",
"url": "https://github.com/ckeditor/ckeditor4-releases.git",
"reference": "db9342ad88e04de66dcf9b132ff41061727778c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ckeditor/ckeditor4-releases/zipball/db9342ad88e04de66dcf9b132ff41061727778c5",
"reference": "db9342ad88e04de66dcf9b132ff41061727778c5",
"shasum": ""
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+",
"LGPL-2.1+",
"MPL-1.1+"
],
"authors": [
{
"name": "CKSource",
"homepage": "https://cksource.com"
}
],
"description": "JavaScript WYSIWYG web text editor.",
"homepage": "https://ckeditor.com/ckeditor-4/",
"keywords": [
"CKEditor",
"ckeditor4",
"editor",
"fckeditor",
"html",
"javascript",
"richtext",
"text",
"wysiwyg"
],
"support": {
"forum": "https://stackoverflow.com/tags/ckeditor",
"issues": "https://github.com/ckeditor/ckeditor4/issues",
"source": "https://github.com/ckeditor/ckeditor4",
"wiki": "https://ckeditor.com/docs/ckeditor4/latest/"
},
"time": "2022-05-18T10:49:44+00:00"
},
{
"name": "clue/stream-filter",
"version": "v1.6.0",
@@ -1831,6 +1879,78 @@
},
"time": "2021-09-28T15:47:34+00:00"
},
{
"name": "laravelcollective/html",
"version": "v6.3.0",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
"reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6",
"reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6",
"shasum": ""
},
"require": {
"illuminate/http": "^6.0|^7.0|^8.0|^9.0",
"illuminate/routing": "^6.0|^7.0|^8.0|^9.0",
"illuminate/session": "^6.0|^7.0|^8.0|^9.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0",
"illuminate/view": "^6.0|^7.0|^8.0|^9.0",
"php": ">=7.2.5"
},
"require-dev": {
"illuminate/database": "^6.0|^7.0|^8.0|^9.0",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~8.5|^9.5.10"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.x-dev"
},
"laravel": {
"providers": [
"Collective\\Html\\HtmlServiceProvider"
],
"aliases": {
"Form": "Collective\\Html\\FormFacade",
"Html": "Collective\\Html\\HtmlFacade"
}
}
},
"autoload": {
"files": [
"src/helpers.php"
],
"psr-4": {
"Collective\\Html\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Adam Engebretson",
"email": "adam@laravelcollective.com"
},
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
}
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "https://laravelcollective.com",
"support": {
"issues": "https://github.com/LaravelCollective/html/issues",
"source": "https://github.com/LaravelCollective/html"
},
"time": "2022-02-08T21:02:54+00:00"
},
{
"name": "laravie/codex",
"version": "v5.3.3",
config/app.php
+7
View File
@@ -176,6 +176,10 @@ return [
App\Providers\RouteServiceProvider::class,
Barryvdh\DomPDF\ServiceProvider::class,
//form
Collective\Html\HtmlServiceProvider::class,
],
/*
@@ -233,6 +237,9 @@ return [
'PDF' => Barryvdh\DomPDF\Facade::class,
'Input' => Illuminate\Support\Facades\Input::class,
'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class,
],
];
resources/views/includes/sidebar.blade.php
+7
View File
@@ -254,6 +254,13 @@
</ul>
</li>
{{-- end laporan --}}
{{-- Kemaskini Notis --}}
<li class="{{ (request()->is('jananotis/*')) ? 'active' : '' }}">
<a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
</li>
{{-- end Kemaskini Notis --}}
@endhasrole
resources/views/jananotis/kemaskininotis.blade.php
+63
View File
@@ -0,0 +1,63 @@
@extends('layouts.app')
@section('content')
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
<script src="https://cdn.ckeditor.com/4.16.2/standard/ckeditor.js"></script>
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto card">
<h3 class="pt-3">Kemaskini Notis Lelong</h3>
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
<form action="{{route('jananotis.store')}}" method="POST" enctype="multipart/form-data">
@csrf
<div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">Format Notis</label>
<div class="col-sm-4" id="para2">
<textarea name="para2" rows="10" cols="100" id="article-ckeditor" required>
{{$tetapan->para2}}
</textarea>
</div>
</div>
<div class="form-group row">
<div class="col-sm-10">
<button type="submit" class="btn btn-primary">Simpan</button>
</div>
</div>
</form>
</div>
</div>
</div>
<script>
$('#caw').select2({
width: '100%',
placeholder: "Pilih Cawangan",
allowClear: true
});
$(document).ready(function () {
$("input[name=fasa]").change(function(){
if($("#fasa1").is(':checked')){
$("#jbg").val('').prop("readonly", false);
}
if($("#fasa2").is(':checked')){
$("#jbg").val('12').prop("readonly", true);
}
});
});
</script>
@endsection
resources/views/layouts/app.blade.php
+5 -1
View File
@@ -298,7 +298,11 @@
@yield('content')
</main>
</div>
<script src="/vendor/unisharp/laravel-ckeditor/ckeditor.js"></script>
<script>
CKEDITOR.replace( 'article-ckeditor' );
</script>
</body>
</html>
resources/views/simulasi/showsimulasi.blade.php
+17 -17
View File
@@ -253,11 +253,11 @@
// if(index%2 ==0 ) //even-0-2-4
// {
$(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
}
else //odd-1-3-5-7
{
$(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
}
// }
// else //odd-1-3-5-7
// {
// $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
// }
})
$("#hideform").show();
$("#btnkemaskini").hide();
@@ -292,19 +292,19 @@
let newhargaasas = harga1 + (harga2);
count++;
$('#harga2'+index).val(newhargaasas.toFixed(2));
}
else
{
let harga1 = parseInt(hargaasasbaru);
let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
let newhargaasas = (harga1 + (harga2))/2.72;;
count++;
$('#harga'+index).val(newhargaasas.toFixed(2));
}
// }
// else
// {
// let harga1 = parseInt(hargaasasbaru);
// let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
// let newhargaasas = (harga1 + (harga2))/2.72;;
// count++;
// $('#harga'+index).val(newhargaasas.toFixed(2));
// }
if(count == maxcolumn)
{
count = 0;
// if(count == maxcolumn)
// {
// count = 0;
indexarray++;
// }
}
routes/web.php
+7 -3
View File
@@ -179,8 +179,8 @@ Route::group(['prefix'=>'lelong'], function () {
// });
Route::group(['prefix'=>'pemenang'], function () {
Route::group(['middleware' => ['permission:janapemenang']], function () {
Route::group(['prefix'=>'pemenang'], function () {
Route::group(['middleware' => ['permission:janapemenang']], function () {
Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']);
Route::get('/janapemenangbycaw/{lelong_id}/{cawid}',['as'=>'lelong.janapemenangbycaw','uses'=>'LelongController@janapemenangbycaw']);
@@ -305,7 +305,7 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
});
// Pengurus Cawangan
// Pengurus Cawangan
Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () {
Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']);
@@ -317,6 +317,10 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
Route::post('/listnotis',['as'=>'jananotis.listnotis','uses'=>'NotisController@listnotis']);
Route::get('/send-email',['as'=>'jananotis.email','uses'=>'MailController@sendEmail']);
Route::get('/kemaskininotis',['as'=>'jananotis.kemaskininotis','uses'=>'NotisController@kemaskininotis']);
Route::post('/store',['as'=>'jananotis.store','uses'=>'NotisController@store']);
});
//Report