Commit 87c371b4 by f3brysan

push dari laptop lama

parent 5c2ed748
......@@ -17,11 +17,51 @@ class AgendaController extends Controller
{
public function index(Request $request)
{
if($request->ajax())
{
$data = UserAgenda::whereDate('start', '>=', $request->start)
->whereDate('end', '<=', $request->end)
// $ngajar = DB::connection('siakad')->table('akt_ajar_dosen as a')
// ->select('k.id_kls','m.nm_mk', 'j.int_hari1', 'j.int_hari2', 'j.jam11', 'j.jam12')
// ->leftJoin('kelas_kuliah as k', 'k.id_kls', '=', 'a.id_kls')
// ->leftJoin('kelas_jadwal as j', 'j.id_kls', '=', 'a.id_kls')
// ->leftJoin('matkul as m', 'm.id_mk', '=', 'k.id_mk')
// ->leftJoin('reg_ptk as r', 'r.id_reg_ptk', '=', 'a.id_reg_ptk')
// ->leftJoin('sdm as s', 's.id_sdm', '=', 'r.id_sdm')
// ->where('s.nip', $nip)
// ->get();
// dd($ngajar);
if($request->ajax()) {
$tahun = '2023';
$nip = '199309052019032017';
// $data = UserAgenda::whereDate('start', '>=', $request->start)
// ->whereDate('end', '<=', $request->end)
// ->get(['id', 'title', 'start', 'end']);
$data = DB::connection('eoffice')->table('tr_surat_masuk')
->select('tr_surat_masuk.id', 'tr_surat_masuk.perihal as title', 'tr_surat_masuk.tglmulai as start', 'tr_surat_masuk.tglmulai as end', 'tr_surat_masuk.jam_mulai', 'tr_surat_masuk.jam_selesai')
->leftJoin('tr_penerima_surat_masuk as a', 'a.idsurat', '=', 'tr_surat_masuk.id')
// ->where('a.nip', $nip)
->where('tr_surat_masuk.perihal', 'like', '%undangan%')
->where('tr_surat_masuk.tglmulai', '>=', $request->start)
->where('tr_surat_masuk.tglmulai', '<=', $request->end)
// ->where('tr_surat_masuk.tahun', $tahun)
->get(['id', 'title', 'start', 'end']);
$getData = array();
foreach ($data as $item) {
}
// $data['surat_keluar_eoffice'] = DB::connection('eoffice')->table('tr_surat_keluar')
// ->select('tr_surat_keluar.perihal', 'tr_surat_keluar.tglmulai', 'tr_surat_keluar.jam_mulai', 'tr_surat_keluar.jam_selesai')
// ->leftJoin('tr_penerima_surat_keluar as a', 'a.idsurat', '=', 'tr_surat_keluar.id')
// ->where('a.nip', $nip)
// ->where('tr_surat_keluar.perihal', 'like', '%undangan%')
// ->where('tr_surat_keluar.tahun', $tahun)
// ->get();
// dd($surat);
return response()->json($data);
}
// $data = UserAgenda::all();
......@@ -29,6 +69,25 @@ public function index(Request $request)
return view('user.index');
}
public function surat_masuk(Request $request)
{
$nip = '199309052019032017';
$tahun = '2023';
// $data = UserAgenda::whereDate('start', '>=', $request->start)
// ->whereDate('end', '<=', $request->end)
// ->get(['id', 'title', 'start', 'end']);
$surat = DB::connection('eoffice')->table('tr_surat_masuk')
->select('tr_surat_masuk.id', 'tr_surat_masuk.perihal as title', 'tr_surat_masuk.tglmulai as start', 'tr_surat_masuk.tglmulai as end', 'tr_surat_masuk.jam_mulai', 'tr_surat_masuk.jam_selesai')
->leftJoin('tr_penerima_surat_masuk as a', 'a.idsurat', '=', 'tr_surat_masuk.id')
// ->where('a.nip', $nip)
->where('tr_surat_masuk.perihal', 'like', '%undangan%')
// ->where('tr_surat_masuk.tahun', $tahun)
->get(['id', 'title', 'start', 'end']);
// dd($surat);
}
public function create()
{
$kategori = Kategori::query()->get();
......@@ -52,7 +111,7 @@ public function store(Request $request)
// 'passcode_zoom' => 'required|string',
// ]);
try{
try {
// $swalData = [
// 'type' => 'success',
// 'title' => 'Agenda'
......@@ -69,8 +128,7 @@ public function store(Request $request)
return back()->with('notify-swal', );
alert()->flash('Data berhasil ditambahkan', 'success');
}
catch(Exception $e){
} catch(Exception $e) {
dd($e);
Log::debug('Tambah Agenda Error');
Log::error($e);
......
......@@ -95,13 +95,13 @@
'eoffice' => [
'driver' => 'pgsql',
'host' => env('DB_HOST_EOFFICE', 'localhost'),
'port' => env('DB_PORT_EOFFICE', '5432'),
'database' => env('DB_DATABASE_EOFFICE', 'forge'),
'username' => env('DB_USERNAME_EOFFICE', 'forge'),
'password' => env('DB_PASSWORD_EOFFICE', ''),
'host' => '192.168.0.209',
'database' => 'eoffice',
'username' => 'eoffice',
'password' => '30ff1c3ppt1un3s4',
'charset' => 'utf8',
'prefix' => '',
'port' => '5432',
'schema' => 'public',
],
......@@ -119,13 +119,13 @@
'siakad' => [
'driver' => 'pgsql',
'host' => env('DB_HOST_SIAKAD', 'localhost'),
'port' => env('DB_PORT_SIAKAD', '5432'),
'database' => env('DB_DATABASE_SIAKAD', 'forge'),
'username' => env('DB_USERNAME_SIAKAD', 'forge'),
'password' => env('DB_PASSWORD_SIAKAD', ''),
'host' => '103.242.124.204',
'database' => 'siakadu3',
'username' => 'postgres',
'password' => 'dB5i@kADUunes@@@!!',
'charset' => 'utf8',
'prefix' => '',
'port' => '5432',
'schema' => 'public',
],
......
......@@ -23,9 +23,9 @@ public function run()
$faker = Factory::create();
// generate data by calling methods
for($i = 1; $i <= 10; $i++) {
for($i = 1; $i <= 20; $i++) {
// random waktu
$start_date = $faker->dateTimeBetween('+0 days', '+1 month');
$start_date = $faker->dateTimeBetween('+0 days', '+2 day');
$start_date_clone = clone $start_date;
$hours = rand(1,6);
$end_date = $faker->dateTimeBetween($start_date, $start_date_clone->modify('+'.$hours.' hours'));
......@@ -33,7 +33,7 @@ public function run()
UserAgenda::create([
'idpegawai' => '40a1618d-e46a-4b7f-a730-cfee894c69d2',
'idagenda' => '6a0304c4-5635-4d0d-8371-d5c89b7d41ff',
'nama_agenda' => $faker->sentence,
'title' => $faker->sentence,
'start' => $start_date,
'end' => $end_date
]);
......
......@@ -59,7 +59,7 @@
<p id="date"></p>
<p id="time"></p>
<div class="row">
<a href="javascript:void(0)" class="btn btn-block btn-primary">Tambahkan ke Google Calendar</a>
<a href="https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NzU2NTQ4YzZqcGg1Z2N0Y2Rkc2o4cTVrdWMgZmVicnlzYW4xOTk1QG0&tmsrc=febrysan1995%40gmail.com" class="btn btn-block btn-primary">Tambahkan ke Google Calendar</a>
</div>
</div>
<div class="modal-footer">
......
......@@ -32,6 +32,7 @@
Route::get('/hapus-kategori/{id}',[KategoriController::class,'destroy'])->name('kategori.delete');
Route::get('/agenda', [AgendaController::class,'index'])->name('user.agenda');
Route::get('/agenda/surat-masuk', [AgendaController::class,'surat_masuk']);
Route::get('/tambah-agenda', [AgendaController::class,'create'])->name('user.tambah-agenda');
Route::post('/simpan-agenda', [AgendaController::class,'store'])->name('user.simpan-agenda');
Route::get('/kategori-dokumen', [KategoriDokumenController::class,'index'])->name('kategoridoc.index');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment