Merge branch 'develop' of https://github.com/zetaops/ulakbus into dev…

…elop
zetaops · Jul 28, 2016 · a6125a4 · a6125a4
2 parents 47ed42c + 9a05bfa
commit a6125a4
Show file tree

Hide file tree

Showing 29 changed files with 2,214 additions and 7,598 deletions.
diff --git a/tests/fixtures/ders_subelendirme.csv b/tests/fixtures/ders_subelendirme.csv
diff --git a/tests/fixtures/derslik_ders_programlari.csv b/tests/fixtures/derslik_ders_programlari.csv
diff --git a/tests/fixtures/derslik_sinav_programlari.csv b/tests/fixtures/derslik_sinav_programlari.csv
diff --git a/tests/fixtures/not_girisi.csv b/tests/fixtures/not_girisi.csv
diff --git a/tests/fixtures/ogrenci_ders_atama.csv b/tests/fixtures/ogrenci_ders_atama.csv
diff --git a/tests/fixtures/oi_not_duzenleme.csv b/tests/fixtures/oi_not_duzenleme.csv
@@ -3,5 +3,5 @@ program/|7GPhFaFbPqysh7mnkkd9Bq3cmCh/|{"program_ciktilari": null, "sube_set": []
 degerlendirme_not/|5o4qlnqbBo1ByQDpGC48PyJz31n/|{"puan": 56, "aciklama": null, "timestamp": "2016-02-22T20:50:34.000000Z", "deleted": false, "sinav_tarihi": "0000-00-00T00:00:00Z", "ders_id": null, "updated_at": "2016-04-25T12:52:40.129227Z", "sinav_id": "RoFKPHZNuvXcgOUtxuwEKxHgj95", "ogretim_elemani": "Merim", "ogrenci_id": "RnKyAoVDT9Hc89KEZecz0kSRXRF", "yil": "2016", "donem": "Güz - 2017", "deleted_at": "0000-00-00T00:00:00Z", "ogrenci_no": "43857735910"}
 ogrenci_program/|UEGET7qn9CDj9VEj4n0nbQ7m89d/|{"updated_at": "2016-06-09T08:53:48.391896Z", "ogrencilik_statusu": 0, "giris_puan_turu": 0, "deleted_at": "0000-00-00T00:00:00Z", "diploma_no": null, "ogrenci_id": "RnKyAoVDT9Hc89KEZecz0kSRXRF", "dondurulmus_kayit_set": [{"dondurulmus_kayit_id": "Ka2NiYCZnlQuwcQQ5N9G4oI0PsA"}], "basari_durumu": null, "ders_programi_id": null, "ogrenci_dersi_set": [{"ogrenci_dersi_id": "BMLv08N7pZyX8KwfADfhuZWqJ59"}], "giris_puani": null, "ayrilma_nedeni": 0, "ogrenci_donem": [], "deleted": false, "timestamp": "2016-02-22T20:50:34.000000Z", "program_id": "7GPhFaFbPqysh7mnkkd9Bq3cmCh", "aktif_donem": null, "mezuniyet_tarihi": "0000-00-00T00:00:00Z", "danisman_id": "ZhB2Q1mG7Pjk2zV2fj8lTQwYBPO", "belgeler": [], "giris_tarihi": "2014-10-01T00:00:00Z", "ogrenci_ders_kayit_status": 0, "ogrenci_no": "34701568102"}
 ogrenci_dersi/|3QSRTg42S9LtnUtbwbTwom7vyD/|{"ogrenci_program_id": "ZOQpL23OsEUWqUuslPD8CFNp74j", "alis_bicimi": 1, "katilim_durumu": false, "deleted": false, "timestamp": "2016-02-22T20:50:34.000000Z", "updated_at": "2016-04-21T09:11:48.322323Z", "basari_ortalamasi": null, "ogrenci_id": null, "sube_id": "Py6DzUxNVRSYHJVI1wMxIZ2n9ec", "ders_id": "7MDnhMpJICJvinbzIcZf5ZtbqlP", "deleted_at": "0000-00-00T00:00:00Z", "harflendirilmis_not": null, "donem_id": "GRc6D86egPKSrXv1eDWs39FnJpV"}
-ders/|7MDnhMpJICJvinbzIcZf5ZtbqlP/|{"ad": "Uygulamalı Psikolojik Testler", "onkosul": null, "sube_set": [{"sube_id": "1RlP7nT5drhjvdjtLxVteGrEVY1"}, {"sube_id": "SLthM91rYYcDJLCPLRQsTgIkX8W"}, {"sube_id": "Py6DzUxNVRSYHJVI1wMxIZ2n9ec"}], "ders_icerigi": null, "updated_at": "2016-04-21T09:11:48.336237Z", "ogrenme_ciktilari": null, "ders_mufredati": null, "yerel_kredisi": 8, "ects_kredisi": 4, "deleted_at": "0000-00-00T00:00:00Z", "verilis_bicimi": 0, "ders_kaynaklari": null, "kod": "242", "ogrenci_dersi_set": [{"ogrenci_dersi_id": "3QSRTg42S9LtnUtbwbTwom7vyD"}], "uygulama_saati": 4, "ders_verenler": [], "ders_kategorisi": 0, "ders_set": [], "sinav_set": [{"sinav_id": "Mx8BUpFJmnViekqtNjNowfkNIwg"}, {"sinav_id": "873oihbTylijvGJbQoJcB2Gci64"}, {"sinav_id": "aBtXzROf4yILe8Ji4h3vC9xa8UP"}, {"sinav_id": "V3WelcXEcEpZKaswitltiUYEE1q"}, {"sinav_id": "RoFKPHZNuvXcgOUtxuwEKxHgj95"}], "aciklama": null, "teori_saati": 4, "deleted": false, "timestamp": "2016-02-22T20:50:34.000000Z", "tanim": null, "ders_koordinatoru_id": "YfbDTCHj8aMAHkB1La0sAkWUkUn", "program_id": "7GPhFaFbPqysh7mnkkd9Bq3cmCh", "ders_yardimcilari": [], "zorunlu": false, "katilim_sarti": 0, "degerlendirme": [], "ders_dili": "Turkce", "ders_turu": 0, "yerine_ders_id": null, "donem_id": "GRc6D86egPKSrXv1eDWs39FnJpV", "ders_amaci": null, "degerlendirme_not_set": [{"degerlendirme_not_id": "NwKscag61upZCFBUgJ66SsnQMRa"}, {"degerlendirme_not_id": "QKL9pVOfzYdG6be8tWeBfrWGSJy"}, {"degerlendirme_not_id": "UyyFDWOJIXA3xWqxbNj0h95yBV9"}, {"degerlendirme_not_id": "TtEHntmYNz9RAa0s7jLlkQXwWpH"}, {"degerlendirme_not_id": "ILDSPsQUKihJaib0Zbg1Hj19DSs"}, {"degerlendirme_not_id": "KZuKE9OTFbzXu1QcSz2xoeOq6P0"}, {"degerlendirme_not_id": "5o4qlnqbBo1ByQDpGC48PyJz31n"}, {"degerlendirme_not_id": "LVFEAYKPiL406vE2zb7VswaGAzT"}, {"degerlendirme_not_id": "EZcsGmt9rDdZgXnzOX14eZWE9qw"}, {"degerlendirme_not_id": "QpRVcJlQUuD47GvjtJMP0i2wad0"}, {"degerlendirme_not_id": "Z3Xk67dy2412K9uoatkAuUv0rhl"}, {"degerlendirme_not_id": "WHIwxA9d9Jq83l6jI5Xx7TzX7DW"}, {"degerlendirme_not_id": "2Mp8MqEKonQ2J9jWoRsERA36EQE"}, {"degerlendirme_not_id": "1CASEhWd4MXvRKsdRepPRVknuMl"}, {"degerlendirme_not_id": "YLOgiBrOvJXLMa9nPk0u05U0yYH"}, {"degerlendirme_not_id": "AXGlRCQmgSF2YSbQxlu5n8rANE"}, {"degerlendirme_not_id": "NpubZXyVLPRQNtr29sBcQG7J6ZH"}, {"degerlendirme_not_id": "Nlr1FOA8MkBp7TxKPBcHsOKypEn"}, {"degerlendirme_not_id": "OXsysKBKeNwfxEufOGBOCL2vqbc"}, {"degerlendirme_not_id": "Y5yRFe2NsIb2xz7pSQ1kjBGbU3N"}]}
+ders/|7MDnhMpJICJvinbzIcZf5ZtbqlP/|{"program_donemi": 8, "ad": "Uygulamalı Psikolojik Testler", "onkosul": null, "sube_set": [{"sube_id": "1RlP7nT5drhjvdjtLxVteGrEVY1"}, {"sube_id": "SLthM91rYYcDJLCPLRQsTgIkX8W"}, {"sube_id": "Py6DzUxNVRSYHJVI1wMxIZ2n9ec"}], "ders_icerigi": null, "updated_at": "2016-04-21T09:11:48.336237Z", "ogrenme_ciktilari": null, "ders_mufredati": null, "yerel_kredisi": 8, "ects_kredisi": 4, "deleted_at": "0000-00-00T00:00:00Z", "verilis_bicimi": 0, "ders_kaynaklari": null, "kod": "242", "ogrenci_dersi_set": [{"ogrenci_dersi_id": "3QSRTg42S9LtnUtbwbTwom7vyD"}], "uygulama_saati": 4, "ders_verenler": [], "ders_kategorisi": 0, "ders_set": [], "sinav_set": [{"sinav_id": "Mx8BUpFJmnViekqtNjNowfkNIwg"}, {"sinav_id": "873oihbTylijvGJbQoJcB2Gci64"}, {"sinav_id": "aBtXzROf4yILe8Ji4h3vC9xa8UP"}, {"sinav_id": "V3WelcXEcEpZKaswitltiUYEE1q"}, {"sinav_id": "RoFKPHZNuvXcgOUtxuwEKxHgj95"}], "aciklama": null, "teori_saati": 4, "deleted": false, "timestamp": "2016-02-22T20:50:34.000000Z", "tanim": null, "ders_koordinatoru_id": "YfbDTCHj8aMAHkB1La0sAkWUkUn", "program_id": "7GPhFaFbPqysh7mnkkd9Bq3cmCh", "ders_yardimcilari": [], "zorunlu": false, "katilim_sarti": 0, "degerlendirme": [], "ders_dili": "Turkce", "ders_turu": 0, "yerine_ders_id": null, "donem_id": "GRc6D86egPKSrXv1eDWs39FnJpV", "ders_amaci": null, "degerlendirme_not_set": [{"degerlendirme_not_id": "NwKscag61upZCFBUgJ66SsnQMRa"}, {"degerlendirme_not_id": "QKL9pVOfzYdG6be8tWeBfrWGSJy"}, {"degerlendirme_not_id": "UyyFDWOJIXA3xWqxbNj0h95yBV9"}, {"degerlendirme_not_id": "TtEHntmYNz9RAa0s7jLlkQXwWpH"}, {"degerlendirme_not_id": "ILDSPsQUKihJaib0Zbg1Hj19DSs"}, {"degerlendirme_not_id": "KZuKE9OTFbzXu1QcSz2xoeOq6P0"}, {"degerlendirme_not_id": "5o4qlnqbBo1ByQDpGC48PyJz31n"}, {"degerlendirme_not_id": "LVFEAYKPiL406vE2zb7VswaGAzT"}, {"degerlendirme_not_id": "EZcsGmt9rDdZgXnzOX14eZWE9qw"}, {"degerlendirme_not_id": "QpRVcJlQUuD47GvjtJMP0i2wad0"}, {"degerlendirme_not_id": "Z3Xk67dy2412K9uoatkAuUv0rhl"}, {"degerlendirme_not_id": "WHIwxA9d9Jq83l6jI5Xx7TzX7DW"}, {"degerlendirme_not_id": "2Mp8MqEKonQ2J9jWoRsERA36EQE"}, {"degerlendirme_not_id": "1CASEhWd4MXvRKsdRepPRVknuMl"}, {"degerlendirme_not_id": "YLOgiBrOvJXLMa9nPk0u05U0yYH"}, {"degerlendirme_not_id": "AXGlRCQmgSF2YSbQxlu5n8rANE"}, {"degerlendirme_not_id": "NpubZXyVLPRQNtr29sBcQG7J6ZH"}, {"degerlendirme_not_id": "Nlr1FOA8MkBp7TxKPBcHsOKypEn"}, {"degerlendirme_not_id": "OXsysKBKeNwfxEufOGBOCL2vqbc"}, {"degerlendirme_not_id": "Y5yRFe2NsIb2xz7pSQ1kjBGbU3N"}]}
 sube/|Py6DzUxNVRSYHJVI1wMxIZ2n9ec/|{"ders_programi_set": [], "not_donusum_tablosu": [], "ad": "A101", "ders_katilimi_set": [{"ders_katilimi_id": "B9XBcBnmeeC2TzwkN64LxwNj9Ag"}, {"ders_katilimi_id": "4mzNZCHpEi7KoCaZuoKAQH8NrRO"}, {"ders_katilimi_id": "9uB47fo6lN9O77zz33MfEZ69Pvr"}, {"ders_katilimi_id": "5xFMwGWxZGFie3puK0JyyrkjHlj"}, {"ders_katilimi_id": "POQEl5QJHncRVQqkUFB3Y5jIKU4"}, {"ders_katilimi_id": "MtyvCcY8yHgkDCf487ChwFc6leq"}, {"ders_katilimi_id": "JcpRkDJSd008HIDCiHSMrpPEHDr"}, {"ders_katilimi_id": "OuTyATdgsVVntkVOkJjvfUyxe1f"}, {"ders_katilimi_id": "VeGiLU4VU0rMsQ0sCNqjpZsPFIi"}, {"ders_katilimi_id": "2XHPcUo5Yy1Yddf9ALm2cugtDtX"}], "deleted": false, "timestamp": "2016-02-22T20:50:34.000000Z", "programlar": [], "updated_at": "2016-04-21T09:11:08.347077Z", "kontenjan": 227, "okutman_id": "2aYyE0SHwBdeN6JowOMRug5iC98", "dis_kontenjan": 237, "ogrenci_dersi_set": [{"ogrenci_dersi_id": "5Jj5jRI7Tq4tTA3XkCejlFrhz6Z"}, {"ogrenci_dersi_id": "UWcfZcs51lG1M1r4Jf84fijSgEg"}, {"ogrenci_dersi_id": "BMLv08N7pZyX8KwfADfhuZWqJ59"}, {"ogrenci_dersi_id": "7o94gkr5agdWgtQvYgGMdndrcfP"}, {"ogrenci_dersi_id": "IYl7d9zSXcYQ5x17BppMsmbqrwm"}, {"ogrenci_dersi_id": "Yb58Sno3gCuzc2oc9zMudUxoHgn"}, {"ogrenci_dersi_id": "3QSRTg42S9LtnUtbwbTwom7vyD"}, {"ogrenci_dersi_id": "AGv0BPcumrr4cq7J3DkembxRRU3"}, {"ogrenci_dersi_id": "7yZbowKua0UcLrbqfOTLDPmXC5i"}, {"ogrenci_dersi_id": "RNUHTUsvSApReaZfJO8qYzVWfyP"}], "ders_id": "7MDnhMpJICJvinbzIcZf5ZtbqlP", "deleted_at": "0000-00-00T00:00:00Z", "sinav_set": [{"sinav_id": "RoFKPHZNuvXcgOUtxuwEKxHgj95"}], "donem_id": "GRc6D86egPKSrXv1eDWs39FnJpV"}