diff --git a/easyk/.idea/workspace.xml b/easyk/.idea/workspace.xml
index 8c24051e870cd533a39d380a46fa51a6e61e6138..132370550c7ca11998cb74501d56c23a3866251f 100755
--- a/easyk/.idea/workspace.xml
+++ b/easyk/.idea/workspace.xml
@@ -2,21 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0de5200a-83fb-47ff-b5e2-5d7f5732ecc9" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/Pengajuan.php" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/routes.php" afterPath="$PROJECT_DIR$/app/Http/routes.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Kecamatan.php" afterPath="$PROJECT_DIR$/app/Kecamatan.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Kelurahan.php" afterPath="$PROJECT_DIR$/app/Kelurahan.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Ktp.php" afterPath="$PROJECT_DIR$/app/Ktp.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Notifikasi.php" afterPath="$PROJECT_DIR$/app/Notifikasi.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Rt.php" afterPath="$PROJECT_DIR$/app/Rt.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Rw.php" afterPath="$PROJECT_DIR$/app/Rw.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php" afterPath="$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" />
</list>
<ignored path="easyk.iws" />
<ignored path=".idea/workspace.xml" />
@@ -41,18 +31,29 @@
<file leaf-file-name="routes.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="233">
- <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
+ <state relative-caret-position="1485">
+ <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding>
<element signature="e#7#53#0#PHP" expanded="true" />
<element signature="e#894#934#1#PHP" expanded="false" />
- <element signature="e#2478#5836#1#PHP" expanded="false" />
<element signature="n#createStatuses#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="AuthController.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="232">
+ <caret line="58" column="20" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="20" />
+ <folding>
+ <element signature="e#45#58#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="KTPController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/KTPController.php">
<provider selected="true" editor-type-id="text-editor">
@@ -65,49 +66,41 @@
</provider>
</entry>
</file>
- <file leaf-file-name="2016_03_30_191405_create_database_core.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php">
+ <file leaf-file-name="info.blade.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="278">
- <caret line="238" column="41" selection-start-line="238" selection-start-column="41" selection-end-line="238" selection-end-column="41" />
- <folding />
+ <state relative-caret-position="443">
+ <caret line="400" column="34" selection-start-line="400" selection-start-column="34" selection-end-line="400" selection-end-column="34" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#div#1;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#aside#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="home.blade.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php">
+ <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="67">
- <caret line="49" column="76" selection-start-line="49" selection-start-column="76" selection-end-line="49" selection-end-column="76" />
- <folding />
+ <state relative-caret-position="271">
+ <caret line="94" column="88" selection-start-line="94" selection-start-column="88" selection-end-line="94" selection-end-column="88" />
+ <folding>
+ <element signature="e#40#58#0#PHP" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="progress.blade.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php">
+ <file leaf-file-name="PasswordController.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="39" column="42" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="info.blade.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="427">
- <caret line="350" column="114" selection-start-line="350" selection-start-column="114" selection-end-line="350" selection-end-column="114" />
- <folding>
- <element signature="n#style#0;n#div#0;n#div#1;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#aside#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Kelurahan.php" pinned="false" current-in-tab="true">
+ <file leaf-file-name="Kelurahan.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Kelurahan.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
@@ -130,8 +123,8 @@
<file leaf-file-name="Rw.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Rw.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="17" column="62" selection-start-line="17" selection-start-column="62" selection-end-line="17" selection-end-column="62" />
+ <state relative-caret-position="330">
+ <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
<folding />
</state>
</provider>
@@ -189,7 +182,6 @@
<option value="$PROJECT_DIR$/app/Http/Controllers/UserController.php" />
<option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
<option value="$PROJECT_DIR$/app/Http/Requests/CreateKtpRequest.php" />
- <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" />
<option value="$PROJECT_DIR$/resources/views/auth/register.blade.php" />
<option value="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php" />
<option value="$PROJECT_DIR$/app/Kecamatan.php" />
@@ -199,13 +191,14 @@
<option value="$PROJECT_DIR$/app/Ktp.php" />
<option value="$PROJECT_DIR$/app/Notifikasi.php" />
<option value="$PROJECT_DIR$/app/Pengajuan.php" />
- <option value="$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php" />
- <option value="$PROJECT_DIR$/app/Http/routes.php" />
<option value="$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" />
- <option value="$PROJECT_DIR$/app/Rw.php" />
- <option value="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" />
<option value="$PROJECT_DIR$/app/Kelurahan.php" />
+ <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" />
+ <option value="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" />
+ <option value="$PROJECT_DIR$/app/Rw.php" />
+ <option value="$PROJECT_DIR$/app/Http/routes.php" />
+ <option value="$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php" />
</list>
</option>
</component>
@@ -719,7 +712,7 @@
<workItem from="1459479350248" duration="6257000" />
<workItem from="1459733901505" duration="15281000" />
<workItem from="1459763252326" duration="47701000" />
- <workItem from="1459962805412" duration="22471000" />
+ <workItem from="1459962805412" duration="23728000" />
</task>
<servers />
</component>
@@ -750,7 +743,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="106719000" />
+ <option name="totallyTimeSpent" value="107976000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1366" height="738" extended-state="0" />
@@ -1012,7 +1005,7 @@
<state relative-caret-position="121">
<caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
<folding>
- <element signature="e#33#46#0#PHP" expanded="true" />
+ <element signature="e#33#46#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -1025,14 +1018,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
@@ -1075,14 +1060,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
@@ -1131,16 +1108,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="107" column="9" selection-start-line="107" selection-start-column="9" selection-end-line="107" selection-end-column="9" />
- <folding>
- <element signature="e#40#58#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/info.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
@@ -1173,16 +1140,27 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/Http/routes.php">
+ <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="233">
- <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
- <folding>
- <element signature="e#7#53#0#PHP" expanded="true" />
- <element signature="e#894#934#1#PHP" expanded="false" />
- <element signature="e#2478#5836#1#PHP" expanded="false" />
- <element signature="n#createStatuses#0;n#!!top" expanded="false" />
- </folding>
+ <state relative-caret-position="315">
+ <caret line="39" column="42" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/Kelurahan.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="16" column="62" selection-start-line="16" selection-start-column="62" selection-end-line="16" selection-end-column="62" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -1196,11 +1174,13 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php">
+ <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="39" column="42" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
- <folding />
+ <state relative-caret-position="443">
+ <caret line="400" column="34" selection-start-line="400" selection-start-column="34" selection-end-line="400" selection-end-column="34" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#div#1;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#aside#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1222,27 +1202,41 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/Rw.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="17" column="62" selection-start-line="17" selection-start-column="62" selection-end-line="17" selection-end-column="62" />
+ <state relative-caret-position="330">
+ <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php">
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="427">
- <caret line="350" column="114" selection-start-line="350" selection-start-column="114" selection-end-line="350" selection-end-column="114" />
+ <state relative-caret-position="232">
+ <caret line="58" column="20" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="20" />
<folding>
- <element signature="n#style#0;n#div#0;n#div#1;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#aside#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#45#58#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/Kelurahan.php">
+ <entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="16" column="62" selection-start-line="16" selection-start-column="62" selection-end-line="16" selection-end-column="62" />
- <folding />
+ <state relative-caret-position="1485">
+ <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
+ <folding>
+ <element signature="e#7#53#0#PHP" expanded="true" />
+ <element signature="e#894#934#1#PHP" expanded="false" />
+ <element signature="n#createStatuses#0;n#!!top" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="271">
+ <caret line="94" column="88" selection-start-line="94" selection-start-column="88" selection-end-line="94" selection-end-column="88" />
+ <folding>
+ <element signature="e#40#58#0#PHP" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/easyk/app/Http/Controllers/Auth/AuthController.php b/easyk/app/Http/Controllers/Auth/AuthController.php
index 5b660e206e5c07cd2d0c9f1fbf4ea08977d1c489..cc689f81fbf069c2c945fe37a846f2ab4fe068f0 100755
--- a/easyk/app/Http/Controllers/Auth/AuthController.php
+++ b/easyk/app/Http/Controllers/Auth/AuthController.php
@@ -6,6 +6,7 @@ use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Support\Facades\Validator;
class AuthController extends Controller
{
diff --git a/easyk/app/Http/Controllers/NotifikasiController.php b/easyk/app/Http/Controllers/NotifikasiController.php
index 35ee7ab2b9dfa20843892cb144c14ba94ba5a5c7..3baa74f753a73d9d523fb638fd6885c247edf51b 100644
--- a/easyk/app/Http/Controllers/NotifikasiController.php
+++ b/easyk/app/Http/Controllers/NotifikasiController.php
@@ -92,7 +92,7 @@ class NotifikasiController extends Controller
public function getListPengajuan($user) {
$listPengajuan = [];
- $notifications = Notifikasi::where('id_tujuan', $user->nik)->get();
+ $notifications = Notifikasi::where('id_tujuan', $user->nik)->where('isSetuju', 0)->get();
foreach ($notifications as $notifikasi) {
$ktp = $notifikasi->ktp;
$penduduk = $ktp->penduduk;
diff --git a/easyk/app/Http/routes.php b/easyk/app/Http/routes.php
index a3f182e9538498a19a70523ea716b504963c9a52..5afbd2bd76be05ab63db457b947e6f10ae9093e4 100755
--- a/easyk/app/Http/routes.php
+++ b/easyk/app/Http/routes.php
@@ -87,12 +87,12 @@ Route::post('/persetujuan', function(Request $request) {
$id_ktp = $request->id_ktp;
$ktp = App\Ktp::find($id_ktp);
+ $penduduk = $ktp->penduduk;
$id_sumber = $request->id_sumber;
$tipe_sumber = $request->tipe_sumber;
- var_dump($setuju);
- $notifikasi = App\Notifikasi::where('id_ktp', $id_ktp)->where('id_tujuan', $id_sumber)->first();
+ $notifikasi = Notifikasi::where('id_ktp', $id_ktp)->first()->where('id_tujuan', $id_sumber)->first();
if(strcmp($setuju, "true") == 0) {
$notifikasi->isSetuju = 1;
$notifikasi->save();
@@ -104,23 +104,8 @@ Route::post('/persetujuan', function(Request $request) {
$newNotifikasi->id_sumber = $id_sumber;
$newNotifikasi->tujuan ="rw";
-
-
-
- $id_kecamatan = App\Kecamatan::where('nama', $ktp->kecamatan)->first()->id;
- $id_kelurahan = App\Kecamatan::find($id_kecamatan)->kelurahan->where('nama', $ktp->kelurahan)->first()->id;
- $id_pengurus_rw = App\Kelurahan::find($id_kelurahan)->rw->where('nama', $ktp->rw)->first()->id_pengurus;
-
-
- $nama_pengurus = App\Penduduk::find($id_pengurus_rw)->nama;
-
-
- $id_tujuan = DB::table('users')->where('name', $nama_pengurus)->first()->id;
-
-
- $newNotifikasi->id_tujuan = $id_tujuan;
- $newNotifikasi->isProcessed = 0;
- $newNotifikasi->isSetuju = -1;
+ $newNotifikasi->id_tujuan =$penduduk->keluarga->rt->rw->pengurus->id;
+ $newNotifikasi->isSetuju = 0;
$newNotifikasi->save();
} else if(strcmp($tipe_sumber, "rw") == 0) {
@@ -131,52 +116,14 @@ Route::post('/persetujuan', function(Request $request) {
$newNotifikasi->tujuan ="kecamatan";
-
-
- $id_kecamatan = App\Kecamatan::where('nama', $ktp->kecamatan)->first()->id;
- $id_pengurus_kecamatan = App\Kecamatan::find($id_kecamatan)->where('nama', $ktp->kecamatan)->first()->id_pengurus;
-
-
- $nama_pengurus = App\Penduduk::find($id_pengurus_kecamatan)->nama;
-
-
- $id_tujuan = DB::table('users')->where('name', $nama_pengurus)->first()->id;
-
-
- $newNotifikasi->id_tujuan = $id_tujuan;
- $newNotifikasi->isProcessed = 0;
- $newNotifikasi->isSetuju = -1;
- $newNotifikasi->save();
- } else {
- $newNotifikasi = new Notifikasi();
- $newNotifikasi->id_ktp = $id_ktp;
- $newNotifikasi->sumber = $tipe_sumber;
- $newNotifikasi->id_sumber = $id_sumber;
-
- $newNotifikasi->tujuan ="warga";
-
- $newNotifikasi->id_tujuan = App\Notifikasi::where('id_ktp', $id_ktp)->where('sumber', 'warga')->first()->id_sumber;
-
- $newNotifikasi->isProcessed = 0;
- $newNotifikasi->isSetuju = 1;
-
+ $newNotifikasi->id_tujuan = $penduduk->keluarga->rt->rw->kelurahan->kecamatan->pengurus->id;
+ $newNotifikasi->isSetuju = 0;
$newNotifikasi->save();
}
+
} else {
- $notifikasi->isSetuju = 0;
+ $notifikasi->isSetuju = -1;
$notifikasi->save();
-
- $newNotifikasi = new Notifikasi();
- $newNotifikasi->id_ktp = $id_ktp;
- $newNotifikasi->sumber = $tipe_sumber;
- $newNotifikasi->id_sumber = $id_sumber;
-
- $newNotifikasi->tujuan ="warga";
- $newNotifikasi->id_tujuan = App\Notifikasi::where('id_ktp', $id_ktp)->where('sumber', 'warga')->first()->id_sumber;
- $newNotifikasi->isProcessed = 0;
- $newNotifikasi->isSetuju = 0;
- $newNotifikasi->save();
-
}
return redirect('/');
diff --git a/easyk/app/Rw.php b/easyk/app/Rw.php
index 78f274dd6096fbac76f0794c4d8b7dfca0e51ebf..4231fe438ad666a3e59480be506469b3909b433b 100755
--- a/easyk/app/Rw.php
+++ b/easyk/app/Rw.php
@@ -20,6 +20,6 @@ class Rw extends Model
public function pengurus() {
- return $this->hasOne('App\Penduduk', 'id_pengurus');
+ return $this->belongsTo('App\Penduduk', 'id_pengurus');
}
}
diff --git a/easyk/resources/views/bdgwebkit/info.blade.php b/easyk/resources/views/bdgwebkit/info.blade.php
index 2ff70ad5491d4c0c0119df3235dd01529fb029fd..937943c2adf6496314adde8f64275124d31c841c 100644
--- a/easyk/resources/views/bdgwebkit/info.blade.php
+++ b/easyk/resources/views/bdgwebkit/info.blade.php
@@ -378,7 +378,7 @@
<input id="_token" name="_token" type="hidden" value="{{ csrf_token() }}" >
<input type="hidden" name="isSetuju" value="true">
<input type="hidden" name="id_ktp" value={{$ktp->id}}>
- <input type="hidden" name="id_sumber" value={{Auth::user()->id}}>
+ <input type="hidden" name="id_sumber" value={{Auth::user()->nik}}>
<input type="hidden" name="tipe_sumber" value={{Auth::user()->tipe}}>
<div class="col-sm-2 text-right">
<button type="submit" class="btn btn-sm btn-default">Setuju</button>
@@ -389,7 +389,7 @@
<input id="_token" name="_token" type="hidden" value="{{ csrf_token() }}" >
<input type="hidden" name="isSetuju" value="false">
<input type="hidden" name="id_ktp" value={{$ktp->id}}>
- <input type="hidden" name="id_sumber" value={{Auth::user()->id}}>
+ <input type="hidden" name="id_sumber" value={{Auth::user()->nik}}>
<input type="hidden" name="tipe_sumber" value={{Auth::user()->tipe}}>
<div class="col-sm-2 text-right">
<button type="submit" class="btn btn-sm btn-default">Tidak Setuju</button>