diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 80a0316e1769d93d140fb9f472e73736c731e1e8..9282b8422edbfbe446730623fdeef21016eef4e6 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +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/Http/Controllers/KeluargaController.php" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/CalonLahir.php" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/database/migrations/2016_04_07_015906_t_easyk.php" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/KKController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/KKController.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$/database/seeds/KtpSeeder.php" afterPath="$PROJECT_DIR$/database/seeds/KtpSeeder.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/includes/nonWarga/header.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/includes/nonWarga/header.blade.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/info.blade.php" afterPath="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/info.blade.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$/storage/logs/laravel.log" afterPath="$PROJECT_DIR$/storage/logs/laravel.log" /> </list> <ignored path="easyk.iws" /> @@ -34,10 +29,10 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="NotifikasiController.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="181"> + <state relative-caret-position="720"> <caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" /> <folding /> </state> @@ -57,8 +52,8 @@ <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="195"> - <caret line="151" column="119" selection-start-line="145" selection-start-column="16" selection-end-line="151" selection-end-column="119" /> + <state relative-caret-position="330"> + <caret line="203" column="4" selection-start-line="203" selection-start-column="4" selection-end-line="203" selection-end-column="55" /> <folding> <element signature="e#7#46#0#PHP" expanded="true" /> </folding> @@ -66,21 +61,31 @@ </provider> </entry> </file> - <file leaf-file-name="Rw.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Rw.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="315"> - <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="23" selection-end-column="5" /> + <state relative-caret-position="450"> + <caret line="262" column="41" selection-start-line="262" selection-start-column="41" selection-end-line="262" selection-end-column="41" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Kecamatan.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/Kecamatan.php"> + <file leaf-file-name="CalonNikah.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/CalonNikah.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" /> + <state relative-caret-position="135"> + <caret line="9" column="31" selection-start-line="0" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CalonLahir.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/app/CalonLahir.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" /> <folding /> </state> </provider> @@ -89,7 +94,7 @@ <file leaf-file-name="KeluargaController.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KeluargaController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="375"> + <state relative-caret-position="675"> <caret line="45" column="31" selection-start-line="45" selection-start-column="31" selection-end-line="45" selection-end-column="31" /> <folding> <element signature="e#40#59#0#PHP" expanded="true" /> @@ -102,7 +107,7 @@ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KKController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="480"> - <caret line="55" column="53" selection-start-line="55" selection-start-column="53" selection-end-line="55" selection-end-column="53" /> + <caret line="55" column="84" selection-start-line="38" selection-start-column="12" selection-end-line="55" selection-end-column="84" /> <folding> <element signature="e#40#59#0#PHP" expanded="true" /> </folding> @@ -110,16 +115,6 @@ </provider> </entry> </file> - <file leaf-file-name="DataPenduduk.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/DataPenduduk.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="405"> - <caret line="32" column="56" selection-start-line="32" selection-start-column="56" selection-end-line="32" selection-end-column="56" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="Keluarga.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/Keluarga.php"> <provider selected="true" editor-type-id="text-editor"> @@ -148,7 +143,6 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/footer.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/includes/warga/header.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/layout/warga/aside.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/statusktp.blade.php" /> @@ -182,7 +176,6 @@ <option value="$PROJECT_DIR$/database/seeds/CalonNikahTableSeeder.php" /> <option value="$PROJECT_DIR$/database/seeds/DatabaseSeeder.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/KTPController.php" /> - <option value="$PROJECT_DIR$/database/migrations/2016_03_30_191405_create_database_core.php" /> <option value="$PROJECT_DIR$/app/Pengajuan.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/pages/nonWarga/home.blade.php" /> <option value="$PROJECT_DIR$/resources/views/bdgwebkit/info.blade.php" /> @@ -195,10 +188,12 @@ <option value="$PROJECT_DIR$/database/seeds/KtpSeeder.php" /> <option value="$PROJECT_DIR$/app/Kecamatan.php" /> <option value="$PROJECT_DIR$/app/Kelurahan.php" /> - <option value="$PROJECT_DIR$/app/Http/routes.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/KeluargaController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/KKController.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/CalonLahir.php" /> </list> </option> </component> @@ -249,8 +244,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -509,42 +502,6 @@ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="templatePPL2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="templatePPL2" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="database" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="seeds" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="templatePPL2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="templatePPL2" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="database" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="migrations" /> - <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> - </PATH_ELEMENT> - </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="templatePPL2" /> @@ -601,6 +558,8 @@ </PATH> </subPane> </pane> + <pane id="Scratches" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -693,6 +652,7 @@ <workItem from="1459962805412" duration="25020000" /> <workItem from="1463211716174" duration="52000" /> <workItem from="1463211798038" duration="28253000" /> + <workItem from="1463282267924" duration="577000" /> </task> <servers /> </component> @@ -723,14 +683,14 @@ </history-entry> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="137573000" /> + <option name="totallyTimeSpent" value="138150000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="31" width="1366" height="737" extended-state="6" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23014706" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23014706" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32866043" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -787,13 +747,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <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" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/Penduduk.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="210"> @@ -819,7 +772,6 @@ <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> @@ -827,7 +779,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="255"> <caret line="20" column="5" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" /> - <folding /> </state> </provider> </entry> @@ -835,18 +786,10 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="285"> <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/easyk/public/css/style.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="230"> - <caret line="1111" column="1" selection-start-line="1111" selection-start-column="1" selection-end-line="1111" selection-end-column="1" /> - <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/easyk/public/css/style.css" /> <entry file="file://$PROJECT_DIR$/public/css/style.css"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="150"> @@ -859,7 +802,6 @@ <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> @@ -867,7 +809,6 @@ <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> @@ -891,7 +832,6 @@ <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> @@ -899,23 +839,14 @@ <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> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/database/seeds/NotifikasiTableSeeder.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="42" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="42" /> - <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/database/seeds/NotifikasiTableSeeder.php" /> <entry file="file://$PROJECT_DIR$/database/seeds/UserTableSeeder.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="315"> <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" /> - <folding /> </state> </provider> </entry> @@ -923,7 +854,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="135"> <caret line="9" column="41" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="41" /> - <folding /> </state> </provider> </entry> @@ -931,7 +861,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="195"> <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" /> - <folding /> </state> </provider> </entry> @@ -939,15 +868,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="195"> <caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" /> - <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="407"> - <caret line="143" column="58" selection-start-line="143" selection-start-column="58" selection-end-line="143" selection-end-column="58" /> - <folding /> </state> </provider> </entry> @@ -955,7 +875,6 @@ <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> @@ -963,7 +882,6 @@ <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> @@ -991,14 +909,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/DataPenduduk.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$/DataPenduduk.php" /> <entry file="file://$PROJECT_DIR$/app/Pengajuan.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="105"> @@ -1011,15 +922,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1305"> <caret line="373" column="49" selection-start-line="300" selection-start-column="44" selection-end-line="373" selection-end-column="49" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/CalonNikah.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="135"> - <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" /> - <folding /> </state> </provider> </entry> @@ -1155,7 +1057,7 @@ </entry> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KeluargaController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="375"> + <state relative-caret-position="675"> <caret line="45" column="31" selection-start-line="45" selection-start-column="31" selection-end-line="45" selection-end-column="31" /> <folding> <element signature="e#40#59#0#PHP" expanded="true" /> @@ -1163,10 +1065,26 @@ </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/Controllers/NotifikasiController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="720"> + <caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/KKController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="480"> - <caret line="55" column="53" selection-start-line="55" selection-start-column="53" selection-end-line="55" selection-end-column="53" /> + <caret line="55" column="84" selection-start-line="38" selection-start-column="12" selection-end-line="55" selection-end-column="84" /> <folding> <element signature="e#40#59#0#PHP" expanded="true" /> </folding> @@ -1175,26 +1093,34 @@ </entry> <entry file="file://$PROJECT_DIR$/app/Http/routes.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="151" column="119" selection-start-line="145" selection-start-column="16" selection-end-line="151" selection-end-column="119" /> + <state relative-caret-position="330"> + <caret line="203" column="4" selection-start-line="203" selection-start-column="4" selection-end-line="203" selection-end-column="55" /> <folding> <element signature="e#7#46#0#PHP" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Ktp.php"> + <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="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="450"> + <caret line="262" column="41" selection-start-line="262" selection-start-column="41" selection-end-line="262" selection-end-column="41" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/Http/Controllers/NotifikasiController.php"> + <entry file="file://$PROJECT_DIR$/app/CalonNikah.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="181"> - <caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" /> + <state relative-caret-position="135"> + <caret line="9" column="31" selection-start-line="0" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/CalonLahir.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" /> <folding /> </state> </provider> diff --git a/app/CalonLahir.php b/app/CalonLahir.php new file mode 100644 index 0000000000000000000000000000000000000000..34aa477df4d92f6a3ba7453252421b1c65443b16 --- /dev/null +++ b/app/CalonLahir.php @@ -0,0 +1,11 @@ +<?php + +namespace App; + +use Illuminate\Database\Eloquent\Model; + +class CalonLahir extends Model +{ + protected $table = 'calon_lahir'; + public $timestamps = false; +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 39539fe0eea9f38a2fd43ebc3130ca75d6f027a7..c2e7b4568ea7a9c6d352fd3b0bd82601a99d7e87 100755 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -176,25 +176,40 @@ Route::post('/persetujuan', function(Request $request) { * Api Buat Kelompok Lain */ Route::post('/api/kawin', function(Request $request) { - $ktpController = new KTPController(); - $nik_pria = $request->nik_pria; $nik_wanita = $request->nik_wanita; + $c = new CalonNikah; + $c->nik_pria = $nik_pria; + $c->nik_Wanita = $nik_wanita; + $c->save(); - $ktpController->update($nik_pria, 'kawin'); - $ktpController->update($nik_wanita, 'kawin'); - - $ktp_pria = KTP::where('nik', $nik_pria)->first(); - $ktp_wanita = KTP::where('nik', $nik_wanita)->first(); + // Create notifikasi + $ktp_controller = new KTPController; + $ktp_pria = $ktp_controller->create_from_penduduk($request->nik_pria); + $ktp_wanita = $ktp_controller->create_from_penduduk($request->nik_wanita); $notifController = new NotifikasiController; $notifController->create($ktp_pria, 'warga', 'Pernikahan'); $notifController->create($ktp_wanita, 'warga', 'Pernikahan'); + $logController = new LogController; + $logController->create($request->nik_pria, 'createKk', 'appPernikahan'); + return new Response('wew'); }); +//nama, alamat, tempat tanggal lahir, jenis kelamin +Route::post('/api/lahir', function(Request $request) { + //nama, alamat, tempat tanggal lahir, jenis kelamin + $name = $request->nama; + $alamat = $request->alamat; + $tempat_lahir = $request->tempat_lahir; + $tanggal_lahir = $request->tanggal_lahir; + $jenis_kelamin = $request->jenis_kelamin; +}); + + /************************************************************************ * API test */ @@ -205,7 +220,6 @@ Route::post('/api/kk', function(Request $request) { }); - function createStatuses(Request $request) { $user = Auth::user(); $notifications = DB::table('notifikasi')->where('tujuan', $user->tipe)->where('id_tujuan', $user->id)->where('isSetuju', -1)->get(); diff --git a/database/migrations/2016_03_30_191405_create_database_core.php b/database/migrations/2016_03_30_191405_create_database_core.php index 28f95200d6c2b84a81c34d8efd51f17f7f980826..7b7de83c8e6c8eb0f43520164f7e66ca6165d67c 100755 --- a/database/migrations/2016_03_30_191405_create_database_core.php +++ b/database/migrations/2016_03_30_191405_create_database_core.php @@ -223,6 +223,22 @@ class CreateDatabaseCore extends Migration $table->foreign('nik_wanita')->references('id')->on('penduduk'); }); } + + //nama, alamat, tempat tanggal lahir, jenis kelamin + if(!Schema::hasTable('calon_lahir')) { + Schema::create('calon_lahir', function (Blueprint $table) { + $table->increments('id'); + $table->string('id_keluarga', 16); + $table->string('nama'); + $table->string('alamat'); + $table->integer('tempat_lahir'); + $table->string('tanggal_lahir'); + $table->string('jenis_kelamin', 1); + + $table->foreign('id_keluarga')->references('id')->on('keluarga')->onDelete('cascade'); + $table->foreign('tempat_lahir')->references('id')->on('kota'); + }); + } } @@ -243,6 +259,8 @@ class CreateDatabaseCore extends Migration Schema::dropIfExists('log'); Schema::dropIfExists('token'); Schema::dropIfExists('kk'); + Schema::dropIfExists('calon_nikah'); + Schema::dropIfExists('calon_lahir'); DB::statement('SET FOREIGN_KEY_CHECKS = 1'); } } diff --git a/database/migrations/2016_04_07_015906_t_easyk.php b/database/migrations/2016_04_07_015906_t_easyk.php deleted file mode 100644 index 9c49e6671c1ad7264bd8399c948e617379695f21..0000000000000000000000000000000000000000 --- a/database/migrations/2016_04_07_015906_t_easyk.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php - -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Database\Migrations\Migration; - -class TEasyk extends Migration -{ - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - // - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -} diff --git a/storage/logs/laravel.log b/storage/logs/laravel.log index 1ecbf1ba9cd56783cadd095964c7b97873dff204..ff40c3ecdcaf6580f58fbd03d341d12a1a5b68be 100644 --- a/storage/logs/laravel.log +++ b/storage/logs/laravel.log @@ -21677,3 +21677,29 @@ Stack trace: #45 /home/tiso/Documents/templatePPL2/public/index.php(53): Illuminate\Foundation\Http\Kernel->handle(Object(Illuminate\Http\Request)) #46 /home/tiso/Documents/templatePPL2/server.php(21): require_once('/home/tiso/Docu...') #47 {main} +[2016-05-15 03:17:56] local.ERROR: PDOException: SQLSTATE[HY000] [1049] Unknown database 'db_ppl_core_devel' in /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php:55 +Stack trace: +#0 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php(55): PDO->__construct('mysql:host=127....', 'easyk', 'easyk', Array) +#1 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php(24): Illuminate\Database\Connectors\Connector->createConnection('mysql:host=127....', Array, Array) +#2 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php(61): Illuminate\Database\Connectors\MySqlConnector->connect(Array) +#3 [internal function]: Illuminate\Database\Connectors\ConnectionFactory->Illuminate\Database\Connectors\{closure}() +#4 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connection.php(864): call_user_func(Object(Closure)) +#5 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connection.php(732): Illuminate\Database\Connection->getPdo() +#6 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connection.php(621): Illuminate\Database\Connection->reconnectIfMissingConnection() +#7 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Connection.php(342): Illuminate\Database\Connection->run('select * from i...', Array, Object(Closure)) +#8 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php(21): Illuminate\Database\Connection->select('select * from i...', Array) +#9 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php(141): Illuminate\Database\Schema\MySqlBuilder->hasTable('migrations') +#10 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php(405): Illuminate\Database\Migrations\DatabaseMigrationRepository->repositoryExists() +#11 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php(103): Illuminate\Database\Migrations\Migrator->repositoryExists() +#12 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php(58): Illuminate\Database\Console\Migrations\MigrateCommand->prepareDatabase() +#13 [internal function]: Illuminate\Database\Console\Migrations\MigrateCommand->fire() +#14 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Container/Container.php(507): call_user_func_array(Array, Array) +#15 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Console/Command.php(169): Illuminate\Container\Container->call(Array) +#16 /home/tiso/Documents/templatePPL2/vendor/symfony/console/Command/Command.php(256): Illuminate\Console\Command->execute(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#17 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Console/Command.php(155): Symfony\Component\Console\Command\Command->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#18 /home/tiso/Documents/templatePPL2/vendor/symfony/console/Application.php(791): Illuminate\Console\Command->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#19 /home/tiso/Documents/templatePPL2/vendor/symfony/console/Application.php(186): Symfony\Component\Console\Application->doRunCommand(Object(Illuminate\Database\Console\Migrations\MigrateCommand), Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#20 /home/tiso/Documents/templatePPL2/vendor/symfony/console/Application.php(117): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#21 /home/tiso/Documents/templatePPL2/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php(107): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#22 /home/tiso/Documents/templatePPL2/artisan(35): Illuminate\Foundation\Console\Kernel->handle(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) +#23 {main}