diff --git a/easyk/.idea/workspace.xml b/easyk/.idea/workspace.xml index 6892133c021e07029d96909f821860f96772369f..8c24051e870cd533a39d380a46fa51a6e61e6138 100755 --- a/easyk/.idea/workspace.xml +++ b/easyk/.idea/workspace.xml @@ -2,12 +2,21 @@ <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/Auth/AuthController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php" /> <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/UserController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserController.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" afterPath="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.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" /> </list> <ignored path="easyk.iws" /> <ignored path=".idea/workspace.xml" /> @@ -29,21 +38,26 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/HomeController.php"> + <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="270"> - <caret line="19" column="7" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" /> - <folding /> + <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> </provider> </entry> </file> - <file leaf-file-name="KTPController.php" pinned="false" current-in-tab="true"> + <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"> - <state relative-caret-position="487"> - <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" /> + <state relative-caret-position="412"> + <caret line="47" column="48" selection-start-line="47" selection-start-column="48" selection-end-line="47" selection-end-column="48" /> <folding> <element signature="e#40#59#0#PHP" expanded="true" /> </folding> @@ -51,85 +65,83 @@ </provider> </entry> </file> - <file leaf-file-name="register.blade.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" /> + <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> </provider> </entry> </file> - <file leaf-file-name="ktpbaru.blade.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="255"> - <caret line="27" column="96" selection-start-line="27" selection-start-column="96" selection-end-line="27" selection-end-column="96" /> + <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> </provider> </entry> </file> - <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> + <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> </file> - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.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="45"> - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="8" selection-end-column="30" /> + <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="e#40#68#0#PHP" expanded="true" /> + <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="AppServiceProvider.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> + <file leaf-file-name="Kelurahan.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/app/Kelurahan.php"> <provider selected="true" editor-type-id="text-editor"> - <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" /> - </folding> + <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> </file> - <file leaf-file-name="AuthController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/AuthController.php"> + <file leaf-file-name="Rt.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Rt.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-248"> - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> + <state relative-caret-position="315"> + <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="PasswordController.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php"> + <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="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <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" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Controller.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> + <file leaf-file-name="Penduduk.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/Penduduk.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> - <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> + <state relative-caret-position="210"> + <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" /> <folding /> </state> </provider> @@ -143,30 +155,18 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/database/seeds/ProvinsiTableSeeder.php" /> - <option value="$PROJECT_DIR$/database/seeds/UserSeeder.php" /> - <option value="$PROJECT_DIR$/database/seeds/KelurahanTableSeeder.php" /> - <option value="$PROJECT_DIR$/database/seeds/KecamatanTableSeeder.php" /> - <option value="$PROJECT_DIR$/database/seeds/PendudukTableSeeder.php" /> - <option value="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" /> <option value="$PROJECT_DIR$/resources/views/auth/loginNw.blade.php" /> <option value="$PROJECT_DIR$/database/seeds/UserTableSeeder.php" /> <option value="$PROJECT_DIR$/database/seeds/DatabaseSeeder.php" /> <option value="$PROJECT_DIR$/resources/views/auth/login.blade.php" /> <option value="$PROJECT_DIR$/database/migrations/2016_03_31_060450_create_notifikasi.php" /> - <option value="$PROJECT_DIR$/app/Kecamatan.php" /> - <option value="$PROJECT_DIR$/app/Rw.php" /> - <option value="$PROJECT_DIR$/app/Kelurahan.php" /> - <option value="$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/index-a.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/notification.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/indexwarga.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/ktpedit.blade.php" /> - <option value="$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php" /> <option value="$PROJECT_DIR$/composer.json" /> <option value="$PROJECT_DIR$/config/app.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/register.blade.php" /> - <option value="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/scripts.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/styles.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/head.blade.php" /> @@ -189,11 +189,23 @@ <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/routes.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" /> + <option value="$PROJECT_DIR$/app/Rt.php" /> + <option value="$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php" /> + <option value="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php" /> + <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" /> </list> </option> </component> @@ -299,14 +311,6 @@ <option name="myItemId" value="bdgwebkit" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="pages" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="warga" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -333,6 +337,10 @@ <option name="myItemId" value="pages" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="warga" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -355,6 +363,14 @@ <option name="myItemId" value="bdgwebkit" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="pages" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="nonWarga" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -374,7 +390,11 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="auth" /> + <option name="myItemId" value="bdgwebkit" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="layout" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -392,11 +412,19 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="lang" /> + <option name="myItemId" value="views" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="en" /> + <option name="myItemId" value="bdgwebkit" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="layout" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="nonWarga" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -413,18 +441,12 @@ <option name="myItemId" value="resources" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="easyk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="easyk" /> + <option name="myItemId" value="views" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="public" /> + <option name="myItemId" value="auth" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -438,21 +460,15 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="config" /> + <option name="myItemId" value="resources" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="easyk" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="easyk" /> + <option name="myItemId" value="lang" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> + <option name="myItemId" value="en" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -466,11 +482,7 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Providers" /> + <option name="myItemId" value="resources" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -484,11 +496,7 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Policies" /> + <option name="myItemId" value="public" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -502,11 +510,7 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Listeners" /> + <option name="myItemId" value="database" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -520,11 +524,11 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> + <option name="myItemId" value="database" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Jobs" /> + <option name="myItemId" value="migrations" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -538,11 +542,7 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Http" /> + <option name="myItemId" value="config" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> @@ -559,14 +559,6 @@ <option name="myItemId" value="app" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Http" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Requests" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -585,10 +577,6 @@ <option name="myItemId" value="Http" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Middleware" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -731,7 +719,7 @@ <workItem from="1459479350248" duration="6257000" /> <workItem from="1459733901505" duration="15281000" /> <workItem from="1459763252326" duration="47701000" /> - <workItem from="1459962805412" duration="15675000" /> + <workItem from="1459962805412" duration="22471000" /> </task> <servers /> </component> @@ -762,7 +750,7 @@ </history-entry> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="99923000" /> + <option name="totallyTimeSpent" value="106719000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="1366" height="738" extended-state="0" /> @@ -826,70 +814,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/resources/views/home.blade.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/Penduduk.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$/app/routes.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/bdgwebkit/register.blade.php" /> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/indexwarga.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1425"> - <caret line="95" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="373" selection-end-column="7" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/scripts.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/head.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/styles.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="30"> - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/footer.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/statusktp.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="353"> @@ -930,14 +854,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1020"> - <caret line="13" column="34" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/nonWarga/aside.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-473"> @@ -962,22 +878,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" /> - <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"> - <caret line="28" column="79" selection-start-line="28" selection-start-column="79" selection-end-line="28" selection-end-column="79" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/layout/warga/layout.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-203"> @@ -995,14 +895,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/layout/nonWarga/layout.blade.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="390"> - <caret line="26" column="53" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/includes/nonWarga/header.blade.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="135"> @@ -1019,14 +911,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Kecamatan.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="285"> - <caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="180"> @@ -1051,14 +935,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Ktp.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$/app/Http/Requests/CreateKtpRequest.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="442"> @@ -1067,39 +943,31 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/progress.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Requests/Request.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="586"> - <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <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/bdgwebkit/pages/warga/home.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="586"> - <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> + <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$/app/Http/routes.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/EncryptCookies.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="145"> - <caret line="51" column="41" selection-start-line="51" selection-start-column="41" selection-end-line="51" selection-end-column="41" /> - <folding> - <element signature="e#7#35#0#PHP" expanded="true" /> - <element signature="e#120#963#1#PHP" expanded="false" /> - <element signature="e#987#1027#1#PHP" expanded="false" /> - <element signature="e#1050#1479#1#PHP" expanded="false" /> - <element signature="e#2690#6048#1#PHP" expanded="false" /> - <element signature="n#createStatus#0;n#!!top" expanded="false" /> - <element signature="n#createStatuses#0;n#!!top" expanded="false" /> - </folding> + <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$/app/Http/Requests/Request.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.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" /> @@ -1107,7 +975,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Middleware/VerifyCsrfToken.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" /> @@ -1115,7 +983,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Middleware/EncryptCookies.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.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" /> @@ -1123,7 +991,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.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" /> @@ -1131,15 +999,33 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Middleware/VerifyCsrfToken.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state relative-caret-position="-398"> <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$/app/Providers/AuthServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> + <provider selected="true" editor-type-id="text-editor"> + <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" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="150"> + <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> + <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" /> @@ -1147,7 +1033,23 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Providers/EventServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="240"> + <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="27" column="96" selection-start-line="27" selection-start-column="96" selection-end-line="27" selection-end-column="96" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Keluarga.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" /> @@ -1155,10 +1057,28 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-398"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="-368"> + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="8" selection-end-column="30" /> + <folding> + <element signature="e#40#68#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/layout/nonWarga/layout.blade.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="307"> + <caret line="26" column="53" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" /> + <folding /> + </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> @@ -1171,83 +1091,160 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> + <entry file="file://$PROJECT_DIR$/app/Ktp.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" /> + <state relative-caret-position="180"> + <caret line="12" column="38" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php"> + <entry file="file://$PROJECT_DIR$/app/Notifikasi.php"> <provider selected="true" editor-type-id="text-editor"> - <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" /> + <state relative-caret-position="180"> + <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Kecamatan.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="345"> + <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/Http/Kernel.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$/app/Pengajuan.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="225"> + <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" /> + <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="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#33#46#0#PHP" expanded="true" /> + <element signature="e#40#58#0#PHP" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php"> + <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="150"> - <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> + <state relative-caret-position="420"> + <caret line="28" column="79" selection-start-line="28" selection-start-column="79" selection-end-line="28" selection-end-column="79" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserController.php"> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/home.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="45"> - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="8" selection-end-column="30" /> + <state relative-caret-position="586"> + <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.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> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.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> + </provider> + </entry> + <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" /> <folding> - <element signature="e#40#68#0#PHP" expanded="true" /> + <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> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Auth/PasswordController.php"> + <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KTPController.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" /> + <state relative-caret-position="412"> + <caret line="47" column="48" selection-start-line="47" selection-start-column="48" selection-end-line="47" selection-end-column="48" /> + <folding> + <element signature="e#40#59#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <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="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/Http/Controllers/Auth/AuthController.php"> + <entry file="file://$PROJECT_DIR$/app/Penduduk.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-248"> - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> + <state relative-caret-position="210"> + <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/auth/register.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Rt.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" /> + <state relative-caret-position="315"> + <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/pages/warga/ktpbaru.blade.php"> + <entry file="file://$PROJECT_DIR$/app/Rw.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="255"> - <caret line="27" column="96" selection-start-line="27" selection-start-column="96" selection-end-line="27" selection-end-column="96" /> + <caret line="17" column="62" selection-start-line="17" selection-start-column="62" selection-end-line="17" selection-end-column="62" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KTPController.php"> + <entry file="file://$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="487"> - <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" /> + <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="e#40#59#0#PHP" expanded="true" /> + <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> + <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> </component> </project> \ No newline at end of file diff --git a/easyk/app/Http/Controllers/KTPController.php b/easyk/app/Http/Controllers/KTPController.php index 0765889de6577f9c21e7f1f7c21a8da3ede78999..8b712b5e3d085459fbf2e1f370a1218c4878bada 100644 --- a/easyk/app/Http/Controllers/KTPController.php +++ b/easyk/app/Http/Controllers/KTPController.php @@ -16,7 +16,6 @@ use App\Http\Requests; class KTPController extends Controller { public function create(Request $request) { - var_dump($request->mynik); $rules = [ 'nik' => 'numeric|digits:5|bail|same:mynik', 'agama' => 'required', @@ -40,27 +39,19 @@ class KTPController extends Controller ->withErrors($validator) ->withInput(); } else { -// $ktp = new Ktp; -// -// $ktp->nik = Input::get('nik'); -// $ktp->nama = Input::get('nama'); -// $ktp->alamat = Input::get('alamat'); -// $ktp->rt = Input::get('rt'); -// $ktp->rw = Input::get('rw'); -// $ktp->kelurahan = Input::get('kelurahan'); -// $ktp->kecamatan = Input::get('kecamatan'); -// $ktp->agama = Input::get('agama'); -// $ktp->status_perkawinan = Input::get('status_perkawinan'); -// $ktp->pekerjaan = Input::get('pekerjaan'); -// $ktp->alasan_edit = Input::get('alasan_edit'); -// $ktp->no_dokumen = Input::get('no_dokumen'); -// -// $ktp->save(); -// -// $notifController = new NotifikasiController; -// $notifController->create($ktp, "createktp", $request); + $ktp = new Ktp; + $ktp->nik = Input::get('nik'); + $ktp->tipe = 'create'; + $ktp->agama = Input::get('agama'); + $ktp->status_perkawinan = Input::get('status_perkawinan'); + $ktp->pekerjaan = Input::get('pekerjaan'); + $ktp->alamat = Input::get('alamat'); + $ktp->save(); + + $notifController = new NotifikasiController; + $notifController->create($ktp, 'warga', $request); + + return redirect('/'); } - - return redirect('/'); } } \ No newline at end of file diff --git a/easyk/app/Http/Controllers/NotifikasiController.php b/easyk/app/Http/Controllers/NotifikasiController.php index 4018bea8d25535de43691fef5290a9b30f3ad351..35ee7ab2b9dfa20843892cb144c14ba94ba5a5c7 100644 --- a/easyk/app/Http/Controllers/NotifikasiController.php +++ b/easyk/app/Http/Controllers/NotifikasiController.php @@ -4,6 +4,8 @@ namespace App\Http\Controllers; use App\Kecamatan; use App\Kelurahan; +use App\Ktp; +use App\Pengajuan; use App\Rw; use App\Rt; use App\Penduduk; @@ -18,50 +20,92 @@ use DB; class NotifikasiController extends Controller { - public function create($ktp, $tipe, $request) { + public function create($ktp, $sumber, $request) { $notif = new Notifikasi(); $notif->id_ktp = $ktp->id; - $notif->tipe = $tipe; - $notif->sumber = 'warga'; - $notif->id_sumber = $request->user()->id; + $notif->sumber = $sumber; + $notif->id_sumber = $ktp->nik; - $notif->tipe = $tipe; - - $id_kecamatan = DB::table('kecamatan')->where('nama', $ktp->kecamatan)->pluck('id')[0]; - $id_kelurahan = Kecamatan::find($id_kecamatan)->kelurahan->where('nama', $ktp->kelurahan)->first()->id; - $id_rw = Kelurahan::find($id_kelurahan)->rw->where('nama', $ktp->rw)->first()->id; - $id_pengurus_rt = Rw::find($id_rw)->rt->where('nama', $ktp->rt)->first()->id_pengurus; - $nama_pengurus = Penduduk::find($id_pengurus_rt)->nama; - - $id_tujuan = DB::table('users')->where('name', $nama_pengurus)->first()->id; + $id_tujuan = Penduduk::find($ktp->nik)->keluarga->rt->pengurus->id; $notif->tujuan = 'rt'; $notif->id_tujuan = $id_tujuan; -// - $notif->isProcessed = 0; // var_dump($id_tujuan); $notif->save(); + } + + public function update() { - return "wew"; } -/* -$notif = new Notifikasi(); -$id_penduduk = DB::table('penduduk')->where('nama', $nama)->pluck('id')[0]; -$notif->message = 'Warga yang bernama '.$nama.' ingin membuat KTP '; + public function getNotifications($user) { + $notifications = []; + $notifikasi = ''; + try { -$notif->sumber = 'warga'; -$notif->id_sumber = $id_penduduk; + $nik = $user->nik; -$notif->tujuan = 'rt'; -$notif->id_tujuan = Penduduk::find($id_penduduk)->keluarga->rt->pluck('id')[0]; -$notif->isProcessed = 0; + $ktpCount = KTP::where('nik', $nik)->count(); -$notif->save();*/ + if($ktpCount == 0) { + return []; + } + + $id_ktp = KTP::where('nik', $nik)->first()->id; + + $ktp = KTP::find($id_ktp); + + $tipe = $ktp->tipe; + + + if(strcmp($tipe, "create") == 0) { + $aksi = 'Pembuatan KTP Baru'; + } else if (strcmp($tipe, "updatektp") == 0) { + $aksi = 'Update KTP Lama'; + } + + + $lastNotification = Notifikasi::where('id_ktp', $ktp->id)->orderBy('created_at', 'desc')->first(); + $currentTujuan = $lastNotification->tujuan; + $setuju = $lastNotification->isSetuju; + + if ($setuju == 0) { + if (strcmp($currentTujuan, 'kecamatan') == 0) { + $notifikasi = $aksi. " Anda Sedang di Proses Kecamatan"; + } else if (strcmp($currentTujuan, 'warga') != 0) { + $notifikasi = $aksi. " Anda Sedang di Proses " . strtoupper($currentTujuan); + } else { + $notifikasi = $aksi. " Anda, Telah mencapai tahap akhir"; + } + } else { + $notifikasi = "Proses Pengajuan " . $aksi . ", di Tolak oleh Pihak " . strtoupper($currentTujuan); + } + } catch (ErrorException $e) {} + if (strcmp($notifikasi, "")!=0) { + array_push($notifications, $notifikasi); + } + return $notifications; + } - public function update() { + public function getListPengajuan($user) { + $listPengajuan = []; + $notifications = Notifikasi::where('id_tujuan', $user->nik)->get(); + foreach ($notifications as $notifikasi) { + $ktp = $notifikasi->ktp; + $penduduk = $ktp->penduduk; + + $tipe = $ktp->tipe; + if(strcmp($tipe, "create") == 0) { + $aksi = 'Pembuatan KTP Baru'; + } else if (strcmp($tipe, "updatektp") == 0) { + $aksi = 'Update KTP Lama'; + } + $pengajuan = new Pengajuan($penduduk->id, $penduduk->nama, $notifikasi->created_at, $aksi ,$ktp->id); + array_push($listPengajuan, new Pengajuan($penduduk->id, $penduduk->nama, $notifikasi->created_at, $aksi ,$ktp->id)); + } + return $listPengajuan; } } diff --git a/easyk/app/Http/routes.php b/easyk/app/Http/routes.php index 174ac367123607201547eef8d1255ca9e27419ec..a3f182e9538498a19a70523ea716b504963c9a52 100755 --- a/easyk/app/Http/routes.php +++ b/easyk/app/Http/routes.php @@ -1,28 +1,26 @@ <?php +use App\Http\Controllers\NotifikasiController; use Illuminate\Http\Request; -use Illuminate\Http\Response; use App\Notifikasi; +use Illuminate\Support\Facades\Auth; Route::auth(); + + Route::get('/', function(Request $request) { if(Auth::check()) { $user = $request->user(); $tipe = $user->tipe; + $notifikasiController = new NotifikasiController; if (strcmp($tipe, "warga") == 0) { - $id_user = Auth::user()->id; - - try { - $id_ktp = DB::table('notifikasi')->where('sumber', 'warga')->where('id_sumber', $id_user)->first()->id_ktp; - $nik = App\Ktp::find($id_ktp)->nik; - } catch (ErrorException $e) {} - - $statuses = createStatus($request); + $statuses = $notifikasiController->getNotifications(Auth::user()); return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'page' => 'home']); + } else { - $notifications = createStatuses($request); + $notifications = $notifikasiController->getListPengajuan(Auth::user()); return view('bdgwebkit.layout.nonWarga.layout', ['notifications' => $notifications, 'page' => 'home']); } } else { @@ -38,8 +36,9 @@ Route::get('/ktp', function(Request $request) { if(Auth::check()) { $user = $request->user(); $tipe = $user->tipe; + $notifikasiController = new NotifikasiController; if (strcmp($tipe, "warga") == 0) { - $statuses = createStatus($request); + $statuses = $notifikasiController->getNotifications(Auth::user()); return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'page' => 'ktpbaru']); } else { return redirect('/'); @@ -55,23 +54,20 @@ Route::post('/ktp', 'KTPController@create'); Route::get('/info/{id}', function($id) { $ktp = App\Ktp::find($id); - return view('bdgwebkit.layout.nonWarga.layout', ['ktp' => $ktp, 'page' => 'info']); + return view('bdgwebkit.info', ['ktp' => $ktp, 'page' => 'info']); }); Route::get('/progress', function(Request $request) { if(Auth::check()) { $id_user = Auth::user()->id; + $notifikasiController = new NotifikasiController; + $statuses = $notifikasiController->getNotifications(Auth::user()); try { - $id_ktp = DB::table('notifikasi')->where('sumber', 'warga')->where('id_sumber', $id_user)->first()->id_ktp; - $nik = App\Ktp::find($id_ktp)->nik; - $nama = App\Penduduk::find($nik)->nama; - $statuses = createStatus($request); - return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'nik' => $nik, 'nama' => $nama, 'page' => 'progress']); - + return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'page' => 'progress']); } catch (ErrorException $e) { $statuses = []; - return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'nik' => '', 'nama'=>'', 'page' => 'progress']); + return view('bdgwebkit.layout.warga.layout', ['statuses' => $statuses, 'page' => 'progress']); } } else { return view('auth/login'); @@ -186,46 +182,7 @@ Route::post('/persetujuan', function(Request $request) { return redirect('/'); }); -function createStatus(Request $request) { - $status = ""; - try { - $id_user = Auth::user()->id; - $id_ktp = DB::table('notifikasi')->where('sumber', 'warga')->where('id_sumber', $id_user)->first()->id_ktp; - - $tipe = App\Ktp::find($id_ktp)->tipe; - - if(strcmp($tipe, "createktp") == 0) { - $aksi = 'Pembuatan KTP Baru'; - } else if (strcmp($tipe, "updatektp") == 0) { - $aksi = 'Update KTP Lama'; - } else if(strcmp($tipe, "createkk") == 0) { - $aksi = 'Pembuatan KK Baru'; - } else if (strcmp($tipe, "updatekk") == 0) { - $aksi = 'Update KK Lama'; - } else { - $aksi = 'Pembuatan KTP Baru'; - } - - $is_kecamatan = DB::table('notifikasi')->where('tujuan', 'kecamatan')->count(); - if($is_kecamatan) { - $status = $aksi . '( Sedang Di Proses Kecamatan ) '; - } - $is_rw = DB::table('notifikasi')->where('tujuan', 'rw')->count(); - if($is_rw) { - $status = $aksi . '( Menunggu Persetujuan RW ) '; - } - $is_rt = DB::table('notifikasi')->where('tujuan', 'rt')->count(); - if($is_rt) { - $status = $aksi . '( Menunggu Persetujuan RT ) '; - } - } catch (ErrorException $e) {} - $statuses = []; - if (strcmp($status, "")!=0) { - array_push($statuses, $status); - } - return $statuses; -} function createStatuses(Request $request) { $user = Auth::user(); diff --git a/easyk/app/Kecamatan.php b/easyk/app/Kecamatan.php index d8fd4dcd6e55a043c2cc29db950fb008d465e426..fdbd5749b3c4f31abeb231809e8ea5860c62e277 100755 --- a/easyk/app/Kecamatan.php +++ b/easyk/app/Kecamatan.php @@ -17,4 +17,9 @@ class Kecamatan extends Model public function kota() { return $this->belongsTo('App\Kota'); } + + + public function pengurus() { + return $this->hasOne('App\Penduduk', 'id_pengurus'); + } } diff --git a/easyk/app/Kelurahan.php b/easyk/app/Kelurahan.php index d0d132285766f521eadfa6f759a15225be06c9e0..476ef879223aaeabb53858aac10e205b735a69f4 100755 --- a/easyk/app/Kelurahan.php +++ b/easyk/app/Kelurahan.php @@ -14,6 +14,6 @@ class Kelurahan extends Model } public function kecamatan() { - return $this->belongsTo('App\Kecamatan'); + return $this->belongsTo('App\Kecamatan', 'id_kecamatan'); } } diff --git a/easyk/app/Ktp.php b/easyk/app/Ktp.php index 47d965bfa8332e01325327526c3ad806daf3b347..51de6fa38de5a842e95b0c0c687b721bf4cbbf8b 100644 --- a/easyk/app/Ktp.php +++ b/easyk/app/Ktp.php @@ -8,4 +8,8 @@ class Ktp extends Model { protected $table = 'ktp'; public $timestamps = false; + + public function penduduk() { + return $this->belongsTo('App\Penduduk', 'nik'); + } } diff --git a/easyk/app/Notifikasi.php b/easyk/app/Notifikasi.php index f0deb0935edf412588790740ced30a2bd800ecda..5386858306d18cfcbcf3967d158e5ca3a6b6a921 100755 --- a/easyk/app/Notifikasi.php +++ b/easyk/app/Notifikasi.php @@ -8,4 +8,8 @@ class Notifikasi extends Model { protected $table = 'notifikasi'; public $timestamps = false; + + public function ktp() { + return $this->belongsTo('App\Ktp', 'id_ktp'); + } } diff --git a/easyk/app/Pengajuan.php b/easyk/app/Pengajuan.php new file mode 100644 index 0000000000000000000000000000000000000000..055c93bdb39e287d7e2b051dec31702be2afd508 --- /dev/null +++ b/easyk/app/Pengajuan.php @@ -0,0 +1,16 @@ +<?php + +namespace app; + + +class Pengajuan +{ + public $nik, $nama, $tanggal, $detil, $id_ktp; + public function __construct($nik, $nama, $tanggal, $detil, $id_ktp) { + $this->nik = $nik; + $this->nama = $nama; + $this->tanggal = $tanggal; + $this->detil = $detil; + $this->id_ktp = $id_ktp; + } +} \ No newline at end of file diff --git a/easyk/app/Rt.php b/easyk/app/Rt.php index 316de4d733d33c7806c92fd69a95712d80027591..ec79a9d22693791c8f8da2fea0c8696f4134925c 100755 --- a/easyk/app/Rt.php +++ b/easyk/app/Rt.php @@ -17,4 +17,8 @@ class Rt extends Model public function rw() { return $this->belongsTo('App\Rw', 'id_rw'); } + + public function pengurus() { + return $this->belongsTo('App\Penduduk', 'id_pengurus'); + } } diff --git a/easyk/app/Rw.php b/easyk/app/Rw.php index 979ed7c3b29c8893b1ae98765aee9c60d4e95b0a..78f274dd6096fbac76f0794c4d8b7dfca0e51ebf 100755 --- a/easyk/app/Rw.php +++ b/easyk/app/Rw.php @@ -15,6 +15,11 @@ class Rw extends Model } public function kelurahan() { - return $this->belongsTo('App\Kelurahan'); + return $this->belongsTo('App\Kelurahan', 'id_kelurahan'); + } + + + public function pengurus() { + return $this->hasOne('App\Penduduk', 'id_pengurus'); } } diff --git a/easyk/database/migrations/2016_03_30_191405_create_database_core.php b/easyk/database/migrations/2016_03_30_191405_create_database_core.php index e8fadc8b66fd6364dfb1720f6002d6e7ec2ea8d0..91607786b8921bbb822a8ca694c2820dc2f86d6b 100755 --- a/easyk/database/migrations/2016_03_30_191405_create_database_core.php +++ b/easyk/database/migrations/2016_03_30_191405_create_database_core.php @@ -234,13 +234,9 @@ class CreateDatabaseCore extends Migration Schema::create('ktp', function (Blueprint $table) { $table->increments('id'); $table->string('nik', 16); - $table->string('nama', 50); - $table->string('alamat'); - $table->string('rt'); - $table->string('rw'); - $table->string('kelurahan'); - $table->string('kecamatan'); + $table->enum('tipe', array('create', 'update')); $table->string('agama'); + $table->string('alamat'); $table->string('status_perkawinan', 50); $table->string('pekerjaan'); $table->string('alasan_edit')->nullable(); @@ -254,7 +250,6 @@ class CreateDatabaseCore extends Migration Schema::create('notifikasi', function (Blueprint $table) { $table->increments('id'); $table->unsignedInteger('id_ktp'); - $table->enum('tipe', array('createktp, updatektp, createkk, updatekk')); $table->enum('sumber', array('warga', 'rt', 'rw', 'kelurahan', 'kecamatan')); $table->string('id_sumber', 16); $table->enum('tujuan', array('warga', 'rt', 'rw', 'kelurahan', 'kecamatan')); diff --git a/easyk/resources/views/bdgwebkit/info.blade.php b/easyk/resources/views/bdgwebkit/info.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..2ff70ad5491d4c0c0119df3235dd01529fb029fd --- /dev/null +++ b/easyk/resources/views/bdgwebkit/info.blade.php @@ -0,0 +1,442 @@ + + +<!DOCTYPE html> +<html lang="en" class=""> +<head> + <meta charset="utf-8" /> + <title>easyK | BDGWEBKIT</title> + <meta name="description" content="easyK" /> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" /> + <link rel="stylesheet" href="../../libs/assets/animate.css/animate.css" type="text/css" /> + <link rel="stylesheet" href="../../libs/assets/font-awesome/css/font-awesome.min.css" type="text/css" /> + <link rel="stylesheet" href="../../libs/assets/simple-line-icons/css/simple-line-icons.css" type="text/css" /> + <link rel="stylesheet" href="../../libs/jquery/bootstrap/dist/css/bootstrap.css" type="text/css" /> + + <link rel="stylesheet" href="../css/font.css" type="text/css" /> + <link rel="stylesheet" href="../css/style.css" type="text/css" /> + + +</head> +<body> +<div class="app app-header-fixed "> + + + <!-- header --> + <header id="header" class="app-header navbar" role="menu"> + <!-- navbar header --> + <div class="navbar-header bg-info"> + <button class="pull-right visible-xs dk" ui-toggle-class="show" target=".navbar-collapse"> + <i class="glyphicon glyphicon-cog"></i> + </button> + <button class="pull-right visible-xs" ui-toggle-class="off-screen" target=".app-aside" ui-scroll="app"> + <i class="glyphicon glyphicon-align-justify"></i> + </button> + <!-- brand --> + <a href="#/" class="navbar-brand text-lt"> + <img src="img/logo-small.png" alt="." class="small-logo hide"> + <img src="img/logo.png" alt="." class="large-logo"> + </a> + <!-- / brand --> + </div> + <!-- / navbar header --> + + <!-- navbar collapse --> + <div class="collapse pos-rlt navbar-collapse bg-info"> + <!-- buttons --> + <div class="nav navbar-nav hidden-xs"> + + </div> + <!-- / buttons --> + + <!-- link and dropdown --> + <ul class="nav navbar-nav hidden-sm"> + <li> + <a href="#">HOME</a> + </li> + <li class="dropdown"> + <a href="#" data-toggle="dropdown" class="dropdown-toggle"> + <i class="fa fa-fw fa-plus visible-xs-inline-block"></i> + <span>STATISTIK</span> <span class="caret"></span> + </a> + <ul class="dropdown-menu" role="menu"> + + <li> + <a href="#"> + <!-- <span class="badge bg-danger pull-right">5</span>--> + <span>Daerah</span> + </a> + </li> + + <li> + <a href="#"> + <!-- <span class="badge bg-info pull-right">15</span>--> + <span>Indonesia</span> + </a> + </li> + + <li> + <a href="#"> + <span>Gender</span> + </a> + </li> + + </ul> + </li> + </ul> + <!-- / link and dropdown --> + + <!-- nabar right --> + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="#" data-toggle="dropdown" class="dropdown-toggle"> + <i class="icon-bdg_alert text14"></i> + <span class="visible-xs-inline">Notifikasi</span> + <span class="badge badge-sm up bg-danger pull-right-xs">1</span> + </a> + <!-- dropdown --> + <div class="dropdown-menu w-xl animated fadeIn"> + <div class="panel bg-white"> + <div class="panel-heading b-light bg-light"> + <strong>Kamu Punya <span>1</span> Notifikasi</strong> + </div> + <div class="list-group"> + <a href class="list-group-item"> + <span class="clear block m-b-none"> + Pengajuan sedang diproses<br> + <small class="text-muted">1 hour ago</small> + </span> + </a> + </div> + <div class="panel-footer text-sm"> + <!-- <a href class="pull-right"><i class="icon-bdg_setting3"></i></a>--> + <a href="/notification" data-toggle="class:show animated fadeInRight"><strong>Lihat Semua Notifikasi</strong></a> + </div> + </div> + </div> + <!-- / dropdown --> + </li> + <!-- + <li class="dropdown"> + <a href="#" data-toggle="dropdown" class="dropdown-toggle"> + <i class="icon-bdg_search text14"></i> + </a> + --> + <!-- dropdown --> + <!-- + <div class="search_wrapper pull-right w-xl animated fadeIn"> + <form action=""> + <i class="pull-left glyphicon glyphicon-search"></i> + <input type="text" class="pull-left" placeholder="Type Here"> + <a href="#" class="remove-search"><i class="pull-right icon-bdg_cross"></i></a> + </form> + </div> + --> + <!-- / dropdown --> + <!-- </li>--> + <li class="dropdown"> + <a href="#" data-toggle="dropdown" class="bg-blue profile-header dropdown-toggle clear" data-toggle="dropdown"> + <span class="thumb-sm avatar pull-left m-t-n-sm m-b-n-sm m-r-sm"> + <img src="img/pevita.JPG" alt="..."> + </span> + <span class="hidden-sm hidden-md m-r-xl">Fulan</span> <i class="text14 icon-bdg_setting3 pull-right"></i> + </a> + <!-- dropdown --> + <ul class="dropdown-menu animated fadeIn w-ml"> + <li> + <a href> + <span class="badge bg-danger pull-right">30%</span> + <span>Settings</span> + </a> + </li> + <li> + <a href>Profile</a> + </li> + <li> + <a href> + <span class="label bg-info pull-right">new</span> + Help + </a> + </li> + <li class="divider"></li> + <li> + <a href="/">Logout</a> + </li> + </ul> + <!-- / dropdown --> + </li> + </ul> + <!-- / navbar right --> + </div> + <!-- / navbar collapse --> + </header> + <!-- / header --> + + + <!-- aside --> + <aside id="aside" class="app-aside hidden-xs bg-dark"> + <div class="aside-wrap"> + <div class="navi-wrap"> + <!-- user --> + <div class="clearfix hidden-xs text-center hide" id="aside-user"> + <div class="dropdown wrapper"> + <a href="app.page.profile"> + <span class="thumb-lg w-auto-folded avatar m-t-sm"> + <img src="img/01.jpg" class="img-full" alt="..."> + </span> + </a> + <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-folded"> + <span class="clear"> + <span class="block m-t-sm"> + <strong class="font-bold text-lt">John.Smith</strong> + <b class="caret"></b> + </span> + <span class="text-muted text-xs block">Art Director</span> + </span> + </a> + <!-- dropdown --> + <ul class="dropdown-menu animated fadeInRight w hidden-folded"> + <li class="wrapper b-b m-b-sm bg-info m-t-n-xs"> + <span class="arrow top hidden-folded arrow-info"></span> + <div> + <p>300mb of 500mb used</p> + </div> + <div class="progress progress-xs m-b-none dker"> + <div class="progress-bar bg-white" data-toggle="tooltip" data-original-title="50%" style="width: 50%"></div> + </div> + </li> + <li> + <a href>Settings</a> + </li> + <li> + <a href="/profile">Profile</a> + </li> + <li> + <a href> + <span class="badge bg-danger pull-right">3</span> + Notifications + </a> + </li> + <li class="divider"></li> + <li> + <a href="page_signin.html">Logout</a> + </li> + </ul> + <!-- / dropdown --> + </div> + <div class="line dk hidden-folded"></div> + </div> + <!-- / user --> + + <!-- nav --> + <nav ui-nav class="navi clearfix"> + <ul class="nav"> + <li class="hidden-folded m-t text-dark-grey text-xs padder-md padder-v-sm"> + <span>Navigation</span> + </li> + <li class="active"> + <a href="/approval" class="text-dark-grey" > + <i class="icon-bdg_dashboard icon-grey"></i> + <span class="font-bold">Awal</span> + </a> + </li> + + <li class="line1 dg"></li> + + <li class="hidden-folded text-dark-grey text-xs padder-md padder-v-sm"> + <span>Components</span> + </li> + <li> + <a href="/statusktp" class="auto"> + <i class="icon-bdg_form"></i> + <span class="font-bold">Progress</span> + </a> + </li> + </ul> + </nav> + <!-- nav --> + + + + </div> + </div> + </aside> + <!-- / aside --> + + <!-- content --> + <div id="content" class="app-content" role="main"> + + <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope"> + <div class="col"> + <div class="app-content-body "> + + <div class="bg-light lter"> + <ul class="breadcrumb bg-grey-breadcrumb m-b-none"> + <li><a href="#" class="btn no-shadow" ui-toggle-class="app-aside-folded" target=".app"> + <i class="icon-bdg_expand1 text"></i> + <i class="icon-bdg_expand2 text-active"></i> + </a> </li> + <li><a href = "approval.html">Home</a></li> + <li class="active"><i class="fa fa-angle-right"></i>Notifikasi</li> + </ul> + </div> + + <div class="bg-light lter b-b wrapper-md padder-md"> + <h1 class="m-n font-semibold h4 text-grey padder">Persetujuan Permohonan</h1> + </div> + + <div class="wrapper-lg"> + <div class="row"> + <div class="col-md-8"> + <div class="panel panel-default"> + <div class="panel-heading font-semibold"> + Detil Pengaju + </div> + + <div class="table-responsive"> + <table class="table table-striped b-t b-light"> + <tbody> + <tr> + <td>NIK</td> + <td> : </td> + <td>{{$ktp->nik}}</td> + </tr> + <tr> + <td>Nama</td> + <td> : </td> + <td>{{$ktp->penduduk->nama}}</td> + </tr> + <tr> + <td>Tempat Lahir</td> + <td> : </td> + <td>{{App\Kota::find(App\Penduduk::find($ktp->nik)->tempat_lahir)->nama}}</td> + </tr> + <tr> + <td>Tanggal Lahir</td> + <td> : </td> + <td>{{App\Penduduk::find($ktp->nik)->tanggal_lahir}}</td> + </tr> + <tr> + <td>Agama</td> + <td> : </td> + <td>{{$ktp->agama}}</td> + </tr> + <tr> + <td>Gol. Darah</td> + <td> : </td> + <td>{{App\Penduduk::find($ktp->nik)->golongan_darah}}</td> + </tr> + <tr> + <td>Alamat</td> + <td> : </td> + <td>{{$ktp->alamat}}</td> + </tr> + <tr> + <td>RT</td> + <td> : </td> + <td>{{$ktp->penduduk->keluarga->rt->nama}}</td> + </tr> + <tr> + <td>RW</td> + <td> : </td> + <td>{{$ktp->penduduk->keluarga->rt->rw->nama}}</td> + </tr> + <tr> + <td>Desa/Kelurahan</td> + <td> : </td> + <td>{{$ktp->penduduk->keluarga->rt->rw->kelurahan->nama}}</td> + </tr> + <tr> + <td>Kecamatan</td> + <td> : </td> + <td>{{$ktp->penduduk->keluarga->rt->rw->kelurahan->kecamatan->nama}}</td> + </tr> + <tr> + <td>Pekerjaan</td> + <td> : </td> + <td>{{$ktp->pekerjaan}}</td> + </tr> + <tr> + <td>Status</td> + <td> : </td> + <td>{{$ktp->status_perkawinan}}</td> + </tr> + <tr> + <td>Kewarganegaraan</td> + <td> : </td> + @if(App\Penduduk::find($ktp->nik)->wni==1) + <td>WNI</td> + @else + <td>Non WNI</td> + @endif + </tr> + </tbody> + </table> + </div> + <footer class="panel-footer"> + <div class="row"> + <form method="POST" action="/persetujuan"> + <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="tipe_sumber" value={{Auth::user()->tipe}}> + <div class="col-sm-2 text-right"> + <button type="submit" class="btn btn-sm btn-default">Setuju</button> + </div> + </form> + + <form method="POST" action="/persetujuan"> + <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="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> + </div> + </form> + </div> + </footer> + </div> + </div> + </div> + + + </div> + </div> + <!-- div app content body --> + </div> + <!-- div.col --> + + + </div> + <!-- end hbox hbox-auto-xs --> + + + </div> + <!-- /content --> + + <!-- footer --> + <footer id="footer" class="app-footer" role="footer"> + <div class="wrapper-md padder-lg b-t bg-light"> + <span class="pull-right">© Copyright Bandung <a href ui-scroll="app" class="m-l-sm text-muted"><i class="icon-bdg_arrow11"></i></a></span> + Made with <i class="text-danger fa fa-heart"></i> in Bandung + </div> + </footer> + <!-- / footer --> + + + +</div> + +<script src="../../libs/jquery/jquery/dist/jquery.js"></script> +<script src="../../libs/jquery/bootstrap/dist/js/bootstrap.js"></script> +<script src="../js/ui-load.js"></script> +<script src="../js/ui-jp.config.js"></script> +<script src="../js/ui-jp.js"></script> +<script src="../js/ui-nav.js"></script> +<script src="../js/ui-toggle.js"></script> +<script src="../js/ui-client.js"></script> +</body> +</html> + diff --git a/easyk/resources/views/bdgwebkit/pages/nonWarga/home.blade.php b/easyk/resources/views/bdgwebkit/pages/nonWarga/home.blade.php index 987776f23b7f154e27cd030fe2f452e937edb69a..0136f1969ce6da5ab6a241351eb6e25a1f1029b3 100644 --- a/easyk/resources/views/bdgwebkit/pages/nonWarga/home.blade.php +++ b/easyk/resources/views/bdgwebkit/pages/nonWarga/home.blade.php @@ -45,9 +45,9 @@ <tbody> @foreach($notifications as $notifikasi) <tr> - <td>{{App\Ktp::find($notifikasi->id_ktp)->nik}}</td> - <td>{{App\Penduduk::find(App\Ktp::find($notifikasi->id_ktp)->nik)->nama}}</td> - <td>{{$notifikasi->created_at}}</td> + <td>{{$notifikasi->nik}}</td> + <td>{{$notifikasi->nama}}</td> + <td>{{$notifikasi->tanggal}}</td> <td> <a href="/info/{{$notifikasi->id_ktp}}" class="ui-toggle-class">Informasi Pengaju</a> </td> diff --git a/easyk/resources/views/bdgwebkit/pages/warga/progress.blade.php b/easyk/resources/views/bdgwebkit/pages/warga/progress.blade.php index f3a2f905e6b7772202cb584d52a6f3c9ed14f9c9..a72510d017a6c28827ebde756a3c537acd02504a 100644 --- a/easyk/resources/views/bdgwebkit/pages/warga/progress.blade.php +++ b/easyk/resources/views/bdgwebkit/pages/warga/progress.blade.php @@ -39,8 +39,8 @@ @foreach($statuses as $status) <tr> - <td>{{$nama}}</td> - <td>{{$nik}}</td> + <td>{{\App\Penduduk::find(\Illuminate\Support\Facades\Auth::user()->nik)->nama}}</td> + <td>{{\Illuminate\Support\Facades\Auth::user()->nik}}</td> <td class="text-success"> {{$status}} </td>