264 Commits

Author SHA1 Message Date
stubbfel
dbd414a19c Merge branch 'release/#r' into develmaster 2013-11-28 12:18:33 +01:00
stubbfel
a31149215b new icons 2013-11-28 12:17:47 +01:00
stubbfel
8a2319110f ad copyrights to the impressum 2013-11-28 09:44:48 +01:00
Christian Fiedler
b11912fa91 Merge branch 'develop' into feature/#290 2013-11-27 14:55:01 +01:00
Christian Fiedler
cf81722efe temp commit 2013-11-27 14:54:36 +01:00
stubbfel
441af8e2a2 fix #276 2013-11-27 13:50:41 +01:00
Christian Fiedler
c3d68f726c Merge branch 'develop' into feature/#290
Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
2013-11-27 13:40:39 +01:00
stubbfel
aa9e0f3636 change informationvalue search from contains to equals 2013-11-27 13:38:26 +01:00
stubbfel
8c2ce5db35 refactor impressum 2013-11-27 12:12:44 +01:00
stubbfel
eb012a8d03 Merge branch 'feature/#155' into develop 2013-11-27 11:14:57 +01:00
stubbfel
560fbaea95 fix bugs 2013-11-27 10:12:11 +01:00
Christian Fiedler
e571e3e2e1 daily commit 2013-11-26 19:06:59 +01:00
Christian Fiedler
a1256ff18e Merge branch 'develop' into feature/#290 2013-11-26 16:22:11 +01:00
Christian Fiedler
11016d033f temp commit 2013-11-26 16:21:30 +01:00
stubbfel
a2f1a7082d add listpicker 2013-11-26 15:24:25 +01:00
stubbfel
abd3488608 adddisplaysetting and unicolor 2013-11-26 11:25:10 +01:00
stubbfel
0ebe01dfe6 finish #292 2013-11-26 09:55:55 +01:00
stubbfel
6c77228a45 Merge branch 'feature/#282' into develop 2013-11-25 18:44:37 +01:00
stubbfel
41780b5c35 finish #282 2013-11-25 18:43:36 +01:00
stubbfel
8e5d761748 add todefault button and refreshpage interface 2013-11-25 16:34:51 +01:00
stubbfel
3a7be7d754 add settingstypes 2013-11-25 16:06:46 +01:00
stubbfel
f721d8547c add Locating, Network setting model 2013-11-25 15:30:27 +01:00
Christian Fiedler
4b022cf099 #286 done 2013-11-25 14:50:35 +01:00
stubbfel
7e0a7b25ef add functionsetting,tagsetting, timetamlbe setting 2013-11-25 14:37:07 +01:00
Christian Fiedler
e741652f7e Merge branch 'feature/#285' into develop 2013-11-25 14:14:42 +01:00
Christian Fiedler
edefc17879 #285 done 2013-11-25 14:14:03 +01:00
stubbfel
e6bd2c3df2 add mensasetting 2013-11-25 13:30:53 +01:00
stubbfel
ad3c73dcf2 add functionsetting page 2013-11-25 12:34:01 +01:00
stubbfel
c92e301a7e add menu entries 2013-11-25 10:53:11 +01:00
Christian Fiedler
1589220445 daily commit 2013-11-22 21:54:35 +01:00
Christian Fiedler
ea717fcef0 #284 fixed 2013-11-22 21:24:21 +01:00
Christian Fiedler
f2c32ce2db Merge branch 'feature/#243' into develop 2013-11-22 20:57:33 +01:00
Christian Fiedler
37460f1555 #243 done 2013-11-22 20:57:17 +01:00
Christian Fiedler
d6ff7890c4 Merge branch 'develop' into feature/#243 2013-11-22 11:16:37 +01:00
stubbfel
43c1e203f8 Merge branch 'release/newstart' into develmaster 2013-11-21 13:35:26 +01:00
stubbfel
70d464b4f5 change tilestyle 2013-11-21 13:34:10 +01:00
stubbfel
adb57146f7 Merge branch 'feature/#189' into develop 2013-11-21 13:23:33 +01:00
stubbfel
d81599f367 finish new startpage 2013-11-21 13:23:04 +01:00
stubbfel
c6b1c73d9e final layout 2013-11-21 11:13:11 +01:00
stubbfel
cba34ffa60 new startpage layout 2013-11-20 15:37:42 +01:00
stubbfel
81594caa96 Merge branch 'feature/#280' into develop 2013-11-19 15:22:02 +01:00
stubbfel
697256e49d add appointment to eventpage 2013-11-19 15:21:49 +01:00
stubbfel
18501ed6ca Merge branch 'develop' into feature/#280 2013-11-19 14:18:59 +01:00
stubbfel
ac42cca415 ad to Appointment 2013-11-19 14:18:29 +01:00
Christian Fiedler
5cb5ac0536 loading 2013-11-19 13:28:17 +01:00
Christian Fiedler
5605491ea9 a 2013-11-19 13:17:24 +01:00
stubbfel
5c21a61167 add lecutre dates 2013-11-18 18:41:47 +01:00
stubbfel
8fa38d3014 Merge branch 'feature/#281' into develop 2013-11-18 17:10:45 +01:00
stubbfel
47660d34ea enable datecreation to qrcode 2013-11-18 17:10:11 +01:00
stubbfel
0b3aec7084 add handler 2013-11-18 16:47:39 +01:00
stubbfel
05bacbf613 Merge branch 'release/merged173' into develmaster 2013-11-18 16:38:00 +01:00
Christian Fiedler
d9b732c27b Merge branch 'feature/#173' into develop 2013-11-18 16:08:21 +01:00
Christian Fiedler
cf56df35d3 merged with develop 2013-11-18 16:08:05 +01:00
Christian Fiedler
b604f02ec7 Merge branch 'develop' into feature/#173 2013-11-18 15:50:36 +01:00
stubbfel
b139e9e0e3 new copyfunction and guifixes (mensapige) 2013-11-18 15:41:35 +01:00
stubbfel
6e5d7c308c add accuracy paramter and save command 2013-11-18 13:06:59 +01:00
stubbfel
55f2cf0705 Merge branch 'hotfix/#277' into develop 2013-11-18 11:38:25 +01:00
stubbfel
53ad8c8279 Merge branch 'hotfix/#277' into develmaster 2013-11-18 11:37:26 +01:00
stubbfel
cea07ff526 add null assert 2013-11-18 11:37:07 +01:00
Christian Fiedler
03b60a40ff nearly done #270 2013-11-15 18:17:02 +01:00
Christian Fiedler
940718e805 intermediat commit 2013-11-15 17:34:42 +01:00
Christian Fiedler
29effd04af Merge branch 'feature/#243' into develop 2013-11-15 14:57:30 +01:00
Christian Fiedler
91c90bce28 done, but not final 2013-11-15 14:57:08 +01:00
Christian Fiedler
d264900b13 nearly done 2013-11-14 20:50:04 +01:00
Christian Fiedler
525964d094 Merge branch 'feature/#204' into develop 2013-11-14 18:19:32 +01:00
Christian Fiedler
4ecc87f863 #204 2013-11-14 18:18:02 +01:00
Christian Fiedler
9607518318 end of day commit 2013-11-13 17:40:10 +01:00
Christian Fiedler
c7f7566e5a Rotation functions added 2013-11-13 14:39:23 +01:00
Christian Fiedler
fa5d2e17e5 #269 done 2013-11-13 13:46:53 +01:00
Christian Fiedler
8365b5b0dc TimeTable done 2013-11-12 17:19:47 +01:00
Christian Fiedler
39f70beab7 TimeSpan-from-ToDay relative loading 2013-11-11 17:46:20 +01:00
Christian Fiedler
6197a4cc12 added timespan-from-today relative appointment loading 2013-11-11 15:15:40 +01:00
Christian Fiedler
d89b544cf0 DayView done 2013-11-08 18:25:22 +01:00
Christian Fiedler
4425a4f562 TimeTableWeek done 2013-11-06 16:55:39 +01:00
Christian Fiedler
1e7d9767ec daily 2013-11-05 19:13:42 +01:00
Christian Fiedler
c225d3b9be daily commit 2013-11-04 19:14:32 +01:00
Christian Fiedler
f1cf9cdefb daily commit 2013-10-29 19:09:22 +01:00
Christian Fiedler
56228da641 daily commit 2013-10-28 19:17:29 +01:00
Christian Fiedler
168f72b979 Merge branch 'develop' into feature/#173 2013-10-25 10:55:20 +02:00
Christian Fiedler
4b33e1fe34 i can see a weekview 2013-10-24 19:26:11 +02:00
Christian Fiedler
c6ea2b5ed7 bla 2013-10-24 13:38:39 +02:00
stubbfel
df6dac4944 Merge branch 'release/r' into develmaster 2013-10-24 13:00:29 +02:00
stubbfel
900d7e1bcd update work folder 2013-10-24 12:58:17 +02:00
stubbfel
8b76c1f687 no message 2013-10-24 11:54:49 +02:00
stubbfel
909a5dd0de Revert "add modul"
This reverts commit f9966f7ad9.
2013-10-24 11:53:51 +02:00
stubbfel
f9966f7ad9 add modul 2013-10-24 11:49:41 +02:00
stubbfel
5e598befd9 Merge branch 'release/#aadsubmodul' into develmaster 2013-10-24 11:34:10 +02:00
stubbfel
136676a894 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-24 11:31:24 +02:00
Christian Fiedler
4f1ff8b0ce CountChar 2013-10-24 11:29:51 +02:00
stubbfel
133b86a292 Merge branch 'feature/addnfclib' into develop 2013-10-24 11:12:07 +02:00
Christian Fiedler
95f5d71391 after merge 2013-10-23 17:01:25 +02:00
stubbfel
35dd770e6f fix geopoint 2013-10-23 15:58:45 +02:00
stubbfel
7a159e22c6 add submodule 2013-10-23 15:36:09 +02:00
stubbfel
37d2a5fcdb add nfclib 2013-10-23 15:35:42 +02:00
Christian Fiedler
8eea6d58d3 temp 2013-10-23 14:19:05 +02:00
Christian Fiedler
edb1936577 some stuff 2013-10-22 20:31:56 +02:00
Christian Fiedler
55339f2da6 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWP8/Settings.StyleCop
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop
2013-10-22 17:33:13 +02:00
stubbfel
4b8b83d583 Merge branch 'hotfix/mvpage' into develop 2013-10-22 14:27:58 +02:00
stubbfel
48844cb23e Merge branch 'hotfix/mvpage' into develmaster 2013-10-22 14:27:57 +02:00
stubbfel
54a79458f4 fix using 2013-10-22 14:27:37 +02:00
stubbfel
92aabfa4f5 Merge branch 'release/r#' into develmaster 2013-10-22 14:03:39 +02:00
stubbfel
3c4f3239c5 finish #265 2013-10-22 14:01:48 +02:00
stubbfel
0633317ad2 mv spsmodel and placemodel 2013-10-22 13:52:09 +02:00
Christian Fiedler
ed75517f26 done 2013-10-22 13:39:16 +02:00
Christian Fiedler
9bfd258480 done 2013-10-22 13:31:08 +02:00
stubbfel
e556017dc8 add geomappoint 2013-10-22 12:15:42 +02:00
stubbfel
8f4f2c88f7 add docs 2013-10-22 11:01:29 +02:00
stubbfel
99f465bb0c add docs 2013-10-22 10:17:47 +02:00
stubbfel
23ccf8de0e Merge branch 'release/r' into develmaster 2013-10-21 18:52:45 +02:00
stubbfel
c1ef3c13bb Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-21 18:51:15 +02:00
stubbfel
b6df184f04 add mapoint 2013-10-21 18:51:09 +02:00
Christian Fiedler
e38f113443 #262 2013-10-21 18:41:21 +02:00
Christian Fiedler
d30d38c1e9 after merge 2013-10-21 18:05:20 +02:00
Christian Fiedler
fc52a18911 after merge 2013-10-21 18:00:14 +02:00
Christian Fiedler
ab6990786d #244 #256 #PortraitLandscapePage 2013-10-21 17:51:19 +02:00
stubbfel
09a7626d49 Merge branch 'feature/#260' into develop 2013-10-21 15:14:29 +02:00
stubbfel
dcff024136 fix docs 2013-10-21 15:14:18 +02:00
stubbfel
d296fe25ea no message 2013-10-21 15:04:24 +02:00
stubbfel
12eb1de958 mv geodb to plc 2013-10-21 15:03:34 +02:00
stubbfel
b4469549be refactor person models 2013-10-21 13:35:11 +02:00
Christian Fiedler
3174669fb1 #256 #244 2013-10-18 21:53:55 +02:00
stubbfel
2b260b2a0b Merge branch 'release/#release' into develmaster 2013-10-18 13:01:53 +02:00
stubbfel
02fc7e4ba5 Merge branch 'feature/release20131018' into develop 2013-10-18 13:01:16 +02:00
stubbfel
224d1efdfc fix names 2013-10-18 13:01:03 +02:00
stubbfel
875fc05fa8 release fixes 2013-10-18 12:32:25 +02:00
stubbfel
5661765481 Merge branch 'release/rc2' into develmaster 2013-10-18 09:36:25 +02:00
stubbfel
af37d3e760 Merge branch 'feature/#257' into develop 2013-10-18 09:35:28 +02:00
stubbfel
a4769600f5 change namespace of taghandler and add docs 2013-10-18 09:32:53 +02:00
stubbfel
a81c36280b update screenshots, change scannfc msgbox, rssbackground to 3 hupdates 2013-10-18 09:14:52 +02:00
stubbfel
0ef0870509 Merge branch 'release/r#255' into develmaster 2013-10-16 15:15:28 +02:00
stubbfel
bd807b16ea check if a nfc or qrtag is an btutag 2013-10-16 15:14:38 +02:00
stubbfel
552131dda4 correct appres 2013-10-16 14:14:20 +02:00
stubbfel
943d559d70 marign and apbar fixes 2013-10-16 14:01:40 +02:00
stubbfel
78a5682d7f edit map 2013-10-16 13:32:46 +02:00
stubbfel
1f549f3763 Merge branch 'release/r' into develmaster 2013-10-16 09:27:28 +02:00
stubbfel
5f76448804 Merge branch 'develmaster' of 141.43.76.143:repos/bare/win8phoneApp into develmaster 2013-10-15 15:19:35 +02:00
stubbfel
46ce22fc59 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-15 15:19:23 +02:00
stubbfel
0e0648681c Merge branch 'hotfix/#243' into develmaster 2013-10-15 15:18:43 +02:00
stubbfel
2e99b7b8be Merge branch 'hotfix/#243' into develop 2013-10-15 15:18:43 +02:00
stubbfel
4fb2f5b06d fix #243 2013-10-15 15:18:27 +02:00
Christian Fiedler
98adae1109 Merge branch 'hotfix/#239' into develop 2013-10-15 15:16:23 +02:00
Christian Fiedler
9538ca42b2 Merge branch 'hotfix/#239' into develmaster 2013-10-15 15:16:22 +02:00
Christian Fiedler
05dd615ca6 #239 #238 2013-10-15 15:15:18 +02:00
stubbfel
f8f3eb89ec add scrollviewer to setting and rename menutiems 2013-10-15 15:00:29 +02:00
stubbfel
876fce515d change Aktualisieren to Aktuali-sieren 2013-10-15 13:57:08 +02:00
stubbfel
a083cbe1bc Merge branch 'release/r#248' into develmaster 2013-10-15 13:43:18 +02:00
stubbfel
edae1e114f add new icons 2013-10-15 13:42:06 +02:00
stubbfel
eb8a42b762 Merge branch 'release/r#251' into develmaster 2013-10-15 13:20:27 +02:00
stubbfel
fdefe1af20 Merge branch 'feature/#251' into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
2013-10-15 13:18:16 +02:00
stubbfel
6d29a46b63 refatcor utilityplc 2013-10-15 13:13:09 +02:00
stubbfel
be2fb8ff06 refactor all plcmodels 2013-10-15 13:10:29 +02:00
Christian Fiedler
2f7ca919cc in between 2013-10-15 12:57:20 +02:00
stubbfel
4f658a0fbc refactor schedulagent 2013-10-15 12:21:01 +02:00
stubbfel
0554b0d2e0 refactor utility 2013-10-15 12:17:51 +02:00
stubbfel
82761a6168 refacto all pages 2013-10-15 12:06:10 +02:00
stubbfel
354bbfc2e4 refactor all model 2013-10-15 11:28:01 +02:00
stubbfel
e9a1df282d add nfc qr info links 2013-10-15 10:34:20 +02:00
stubbfel
85c196df78 refactory campusmapmodel 2013-10-14 18:38:41 +02:00
stubbfel
67a56535ba refactory feeds 2013-10-14 18:22:05 +02:00
stubbfel
cfcfd20956 rm unuse pic 2013-10-14 18:07:01 +02:00
stubbfel
2e6f504493 Merge branch 'release/#231' into develmaster 2013-10-14 17:52:31 +02:00
stubbfel
b41155b3ad Merge branch 'feature/#233' into develop 2013-10-14 17:52:06 +02:00
stubbfel
6f6129ceb2 add UserSettingCampus 2013-10-14 17:51:26 +02:00
stubbfel
b6d33730ee add thread to exmepage 2013-10-14 17:50:52 +02:00
stubbfel
87fc91073a add loading thread to exam page 2013-10-14 17:23:54 +02:00
stubbfel
1aaa934b0e add determine campus offline 2013-10-14 17:13:28 +02:00
stubbfel
d46dd6140e update ignore 2013-10-14 16:13:46 +02:00
stubbfel
026effb354 fix seachbutton 2013-10-14 16:13:00 +02:00
stubbfel
7d5cac18cb Merge branch 'release/#241' into develmaster 2013-10-14 15:43:49 +02:00
stubbfel
e5347364f4 Merge branch 'feature/#241' into develop 2013-10-14 15:41:11 +02:00
stubbfel
a1e527e837 update lensicon 2013-10-14 15:36:04 +02:00
stubbfel
b6ac8959b2 execute all test 1 time 2013-10-14 15:31:49 +02:00
stubbfel
b95b5bc71b add impressum 2013-10-14 15:05:30 +02:00
stubbfel
844953a070 add scrennshots 2013-10-14 13:20:49 +02:00
stubbfel
b98f85166c Merge branch 'release/#240' into develmaster 2013-10-14 11:53:27 +02:00
stubbfel
67241bdca9 add adom prefs 2013-10-14 11:52:40 +02:00
Christian Fiedler
7cbf8de66b Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	work/geoApi/Offlinemap.xml
2013-10-11 15:02:04 +02:00
Christian Fiedler
bb611d60e5 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-11 14:50:13 +02:00
Christian Fiedler
c06828e411 news & event feed safety fix 2013-10-11 14:50:02 +02:00
stubbfel
d6ddd42075 Merge branch 'release/#rc1' into develmaster 2013-10-11 14:43:08 +02:00
stubbfel
38e75365ef add doku 2013-10-11 14:42:47 +02:00
stubbfel
4c09ec4139 fix person bug 2013-10-11 14:35:09 +02:00
stubbfel
874636b5af Merge branch 'feature/addseapkericon' into develop 2013-10-11 14:16:40 +02:00
stubbfel
dcec407160 fix speakersize 2013-10-11 14:15:59 +02:00
stubbfel
a454cd50f1 add speaker icon 2013-10-11 14:14:41 +02:00
Christian Fiedler
1cc19e0b74 Merge branch 'feature/#234' into develop 2013-10-11 13:56:31 +02:00
Christian Fiedler
e78a03d403 fixed 2013-10-11 13:56:12 +02:00
Christian Fiedler
027de4972d Merge branch 'develop' into feature/#234 2013-10-11 13:48:16 +02:00
Christian Fiedler
80f1b9ef5c before merge 2013-10-11 13:47:47 +02:00
stubbfel
f0d1fd4cf2 Merge branch 'feature/listfixes' into develop 2013-10-11 13:46:15 +02:00
stubbfel
f06cb08d7b finish 2013-10-11 13:45:05 +02:00
stubbfel
59a726370e finish 2013-10-11 13:44:46 +02:00
Christian Fiedler
baafabc5c1 no message 2013-10-11 13:25:36 +02:00
stubbfel
c63e3611c1 sort News and Event in backgroundagent 2013-10-11 10:52:28 +02:00
stubbfel
ecba094362 new offline map 2013-10-11 10:43:10 +02:00
Christian Fiedler
931d063d1b Merge branch 'release/#220' into develmaster 2013-10-10 18:14:10 +02:00
Christian Fiedler
5115ffa540 Merge branch 'feature/#220' into develop 2013-10-10 18:13:36 +02:00
Christian Fiedler
4c803da166 fixed #220 2013-10-10 18:12:58 +02:00
stubbfel
926e694eba Merge branch 'feature/#215' into develop 2013-10-10 17:37:11 +02:00
stubbfel
7eced53e92 add new files 2013-10-10 17:36:54 +02:00
stubbfel
4a36b1ba36 add btutaghandler 2013-10-10 17:36:02 +02:00
stubbfel
ecf1147c92 add but Tag info 2013-10-10 14:18:44 +02:00
stubbfel
81e2ec2fb2 some fixes and new sorted startpage 2013-10-10 11:45:19 +02:00
Christian Fiedler
9d441ad478 Merge branch 'feature/#229' into develop 2013-10-09 17:56:44 +02:00
Christian Fiedler
e94bffdab4 #229 #227 #225 #221 #218 #187 2013-10-09 17:55:28 +02:00
stubbfel
3ac3c6221d Merge branch 'feature/#214' into develop 2013-10-09 17:28:55 +02:00
stubbfel
92918be6a7 finish#214 2013-10-09 17:13:09 +02:00
stubbfel
094b769f99 Merge branch 'develop' into feature/#214 2013-10-09 11:45:24 +02:00
stubbfel
31da6d78a7 finish #216 2013-10-09 11:43:49 +02:00
stubbfel
1a9cadc805 pause 2013-10-09 11:22:39 +02:00
stubbfel
1193dda749 aqdd buildmap 2013-10-08 18:16:27 +02:00
stubbfel
916ca31713 finish day2 2013-10-08 18:15:53 +02:00
Christian Fiedler
7a52b2ca39 begin 2013-10-08 17:02:41 +02:00
stubbfel
0696798624 Merge branch 'develop' into feature/#214 2013-10-08 16:10:53 +02:00
stubbfel
d19aae4ff0 fixes 2013-10-08 16:10:39 +02:00
stubbfel
8191b87779 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-08 15:53:24 +02:00
Christian Fiedler
2686deeb0b Merge branch 'feature/#218' into develop 2013-10-08 15:52:06 +02:00
Christian Fiedler
50c1c32466 #222 done 2013-10-08 15:51:16 +02:00
stubbfel
8010781f51 finish #224 2013-10-08 15:50:53 +02:00
stubbfel
e628993a17 finish #226 2013-10-08 15:18:01 +02:00
stubbfel
bb73622aa1 finish #228 2013-10-08 13:46:41 +02:00
stubbfel
f9c2f95ea5 finish 230 2013-10-08 12:50:04 +02:00
stubbfel
0f3bbc3cf6 fix personpage 2013-10-08 12:09:25 +02:00
stubbfel
92097cf881 add header to userprofil 2013-10-08 11:17:06 +02:00
stubbfel
cefe681199 new roomlist 2013-10-08 10:24:36 +02:00
Christian Fiedler
577b2fd061 nearly done 2013-10-07 19:01:31 +02:00
Christian Fiedler
4264e1fcd3 nearly done 2013-10-07 19:00:41 +02:00
Christian Fiedler
540189d86a Merge branch 'release/#219' into develmaster 2013-10-07 17:14:42 +02:00
Christian Fiedler
7bc55f6527 DefaultHeader 2013-10-07 17:13:29 +02:00
Christian Fiedler
98ea0fcfd5 changed week view 2013-10-07 14:16:43 +02:00
Christian Fiedler
13a0cb2cd4 after merge 2013-10-07 08:30:56 +02:00
Christian Fiedler
018619e599 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop
2013-10-02 19:03:20 +02:00
Christian Fiedler
6be3154818 no message 2013-10-02 19:01:48 +02:00
Christian Fiedler
d8e28522b0 week view finished & canvas creations 2013-10-02 18:59:16 +02:00
stubbfel
f1e163c53b Merge branch 'release/r' into develmaster 2013-10-02 16:12:41 +02:00
stubbfel
3869bbda5b finish #213 2013-10-02 16:12:15 +02:00
Christian Fiedler
e4257b1e73 canvas fix in appointmentmodel 2013-10-01 18:00:20 +02:00
Christian Fiedler
cd8d94b7ee Merge branch 'develop' into feature/#173 2013-10-01 11:28:28 +02:00
Christian Fiedler
f3507c7960 week view first submit 2013-10-01 11:27:15 +02:00
Christian Fiedler
d2157f64b2 create appointment done 2013-09-25 20:20:46 +02:00
Christian Fiedler
cb9b2d62a4 appointment edit/create 2013-09-24 17:55:54 +02:00
Christian Fiedler
29efcd8ddb finished multi appointment 2013-09-24 17:02:19 +02:00
Christian Fiedler
543247cea2 multi appointments 2013-09-23 18:16:19 +02:00
Christian Fiedler
824bd7c8b1 no message 2013-09-23 14:01:54 +02:00
Christian Fiedler
3ce33a803b bla 2013-09-23 14:00:05 +02:00
Christian Fiedler
5f7a563f26 merged develop into #173 2013-09-23 09:55:33 +02:00
Christian Fiedler
babb4092d8 dayview pivotitems 2013-09-16 13:59:23 +02:00
Christian Fiedler
92b3fea798 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Settings.StyleCop
2013-09-12 17:36:02 +02:00
Christian Fiedler
156df2766d timetable ui & models 2013-09-12 17:33:12 +02:00
Christian Fiedler
e1c77d5544 timetable ui 2013-09-11 17:00:13 +02:00
Christian Fiedler
ea5a988670 timetable ui 2013-09-09 17:04:34 +02:00
Christian Fiedler
34c38cc1b2 m 2013-09-06 16:44:37 +02:00
Christian Fiedler
51a100d34b Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Settings.StyleCop
	CampusAppWP8/CampusAppWP8/Utility/StringManager.cs
2013-09-06 13:56:41 +02:00
Christian Fiedler
cee9407650 no message 2013-09-06 13:50:39 +02:00
Christian Fiedler
d96a65bf1d class file split 2013-09-05 19:22:36 +02:00
Christian Fiedler
21c0638d0a pre split 2013-09-05 18:05:22 +02:00
Christian Fiedler
589bee809f fixed static name 2013-09-05 14:20:53 +02:00
Christian Fiedler
e02c2d3607 adding classes to dict 2013-09-04 18:59:03 +02:00
Christian Fiedler
4fba48225b ics classes done 2013-09-04 17:28:30 +02:00
Christian Fiedler
f73d722555 ics classes, statics 2013-09-03 18:49:52 +02:00
Christian Fiedler
53fb8599d1 ics classes 2013-09-02 18:09:19 +02:00
Christian Fiedler
81893c8224 added ics classes 2013-08-29 17:05:05 +02:00
Christian Fiedler
4140f2771e dictionary done 2013-08-28 18:05:16 +02:00
Christian Fiedler
880422dc41 ics import 2013-08-26 17:34:58 +02:00
3104 changed files with 337259 additions and 45173 deletions

1
.gitattributes vendored
View File

@@ -25,7 +25,6 @@
*.csproj -text merge=union
*.sln -text merge=union
*.resx -text merge=union
*.StyleCop -text merge=union
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary

4
.gitignore vendored
View File

@@ -160,7 +160,6 @@ winphone/
*.spl
*.srum
Doxyfile
screenshots/
CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl3-wp/Microsoft.Phone.Controls.Toolkit.dll
CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl4-windowsphone71/Microsoft.Phone.Controls.Toolkit.dll
CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/wp8/Microsoft.Phone.Controls.Toolkit.dll
@@ -307,3 +306,6 @@ CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-native+javascript/ZXing.wi
CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.XML
CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.dll
work/.svn/
CampusAppWP8/packages/
*.DLL
*.dll

4
.gitmodules vendored Normal file
View File

@@ -0,0 +1,4 @@
[submodule "CampusAppWP8/NfcLib"]
path = CampusAppWP8/NfcLib
url = git@141.43.76.143:repos/bare/nfclib.git
branch = develop

View File

@@ -0,0 +1,10 @@
<StyleCopSettings Version="105">
<Analyzers>
<Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
<AnalyzerSettings>
<StringProperty Name="CompanyName">BTU/IIT</StringProperty>
<StringProperty Name="Copyright">BTU/IIT</StringProperty>
</AnalyzerSettings>
</Analyzer>
</Analyzers>
</StyleCopSettings>

View File

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppDLL", "CampusAppDL
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppWP8ScheduledTaskAgent", "CampusAppWP8ScheduledTaskAgent\CampusAppWP8ScheduledTaskAgent.csproj", "{2A51FA6C-791B-4935-B869-FDBA9ED774D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ndefpclib", "NfcLib\src\ndefpclib\ndefpclib.csproj", "{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -35,9 +37,9 @@ Global
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.ActiveCfg = Debug|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.Build.0 = Debug|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.Deploy.0 = Debug|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Deploy.0 = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.ActiveCfg = Debug|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.Build.0 = Debug|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.Deploy.0 = Debug|x86
@@ -51,9 +53,9 @@ Global
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.ActiveCfg = Release|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.Build.0 = Release|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.Deploy.0 = Release|ARM
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.ActiveCfg = Release|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Build.0 = Release|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Deploy.0 = Release|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.ActiveCfg = Release|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.Build.0 = Release|x86
{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.Deploy.0 = Release|x86
@@ -67,9 +69,9 @@ Global
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.ActiveCfg = Debug|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.Build.0 = Debug|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.Deploy.0 = Debug|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Deploy.0 = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.ActiveCfg = Debug|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.Build.0 = Debug|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.Deploy.0 = Debug|x86
@@ -85,9 +87,9 @@ Global
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.ActiveCfg = Release|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.Build.0 = Release|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.Deploy.0 = Release|ARM
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.ActiveCfg = Release|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Build.0 = Release|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Deploy.0 = Release|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.ActiveCfg = Release|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.Build.0 = Release|x86
{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.Deploy.0 = Release|x86
@@ -100,8 +102,8 @@ Global
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|ARM.ActiveCfg = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Win32.ActiveCfg = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|x64.ActiveCfg = Debug|Any CPU
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -115,7 +117,7 @@ Global
{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Release|x86.ActiveCfg = Release|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Win32.ActiveCfg = Debug|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|x64.ActiveCfg = Debug|Any CPU
{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -128,8 +130,8 @@ Global
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Win32.ActiveCfg = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -145,8 +147,8 @@ Global
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|ARM.ActiveCfg = Debug|ARM
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|ARM.Build.0 = Debug|ARM
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Win32.ActiveCfg = Debug|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Win32.Build.0 = Debug|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -156,13 +158,29 @@ Global
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Any CPU.Build.0 = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|ARM.ActiveCfg = Release|ARM
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|ARM.Build.0 = Release|ARM
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.ActiveCfg = Release|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.Build.0 = Release|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Win32.ActiveCfg = Release|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Win32.Build.0 = Release|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x64.ActiveCfg = Release|Any CPU
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x86.ActiveCfg = Release|x86
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x86.Build.0 = Release|x86
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|ARM.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Win32.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|x64.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|x86.ActiveCfg = Debug|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Any CPU.Build.0 = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|ARM.ActiveCfg = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Win32.ActiveCfg = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|x64.ActiveCfg = Release|Any CPU
{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -1,27 +1,28 @@
//-----------------------------------------------------------------------
// <copyright file="CampusSpsApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>12.08.2013</sience>
//----------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the campus sps API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.GeoApi
{
using System;
using CampusAppWP8.Model.GeoDb;
using System;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Model.GeoDb;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// Class for SPSAPI
/// </summary>
/// <summary> Class for SPSAPI. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
/// <seealso cref="T:CampusAppWP8.Api.GeoApi.SpsApi"/>
public class CampusSpsApi : SpsApi
{
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="CampusSpsApi" /> class.
/// </summary>
/// <summary> Initializes a new instance of the <see cref="CampusSpsApi" /> class. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
public CampusSpsApi()
: base()
{
@@ -32,30 +33,31 @@ namespace CampusAppWP8.Api.GeoApi
#region Method
/// <summary>
/// Method set the UriParameter of a campusRequest for a given latitude and longitude
/// Method set the UriParameter of a campusRequest for a given latitude and longitude.
/// </summary>
/// <param name="lat">latitude parameter</param>
/// <param name="log">longitude parameter</param>
public void SetupCampusRequest(string lat, string log)
/// <remarks> Stubbfel, 14.10.2013. </remarks>
/// <param name="lat"> latitude parameter. </param>
/// <param name="log"> longitude parameter. </param>
public void SetupCampusRequest(double lat, double log)
{
this.SetupPlaceRequest(lat, log, Constants.SpsApi_CampusDomain);
}
/// <summary>
/// Method set the UriParameter of a campusRequest for the actualPosition
/// </summary>
/// <summary> Method set the UriParameter of a campusRequest for the actualPosition. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
public void SetupCurrentCampusRequest()
{
Utilities.DetermineAndStoreCurrentPosition();
string lat = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Lat);
string log = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Long);
this.SetupCampusRequest(lat, log);
GeoMapPoint currentPosition = App.LoadFromAppState<GeoMapPoint>(Constants.GeoWatch_CurrentPositionPoint);
if (currentPosition != null)
{
this.SetupCampusRequest(currentPosition.Latitude, currentPosition.Longitude);
}
}
/// <summary>
/// Method return the campus of the placeList
/// </summary>
/// <returns>actual campus</returns>
/// <summary> Method return the campus of the placeList. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
/// <returns> actual campus. </returns>
public CampusAppWPortalLib8.Model.Settings.Campus GetCampus()
{
if (this.Model == null)

View File

@@ -1,28 +1,29 @@
//-----------------------------------------------------------------------
// <copyright file="PisApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>09.09.2013</sience>
//----------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the pis API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.GeoApi
{
using System.Collections.Generic;
using CampusAppWP8.Model;
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model;
using CampusAppWPortalLib8.Model.GeoDb;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>Pis api.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <summary> Pis api. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
/// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
public class PisApi : XmlModel<SpsModel>
{
#region Constructor
/// <summary>Initializes a new instance of the PisApi class.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <summary> Initializes a new instance of the PisApi class. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
public PisApi()
: base(ModelType.Feed, Constants.UrlPisService)
{
@@ -32,10 +33,10 @@ namespace CampusAppWP8.Api.GeoApi
#region Method
/// <summary>Sets up the information request.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <param name="pidList"> List of pids.</param>
/// <param name="infoNames">(Optional) list of names of the information.</param>
/// <summary> Sets up the information request. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
/// <param name="pidList"> List of pids. </param>
/// <param name="infoNames"> (Optional) list of names of the information. </param>
public void SetupInformationRequest(List<string> pidList, List<string> infoNames = null)
{
string pidListStr = string.Empty;

View File

@@ -1,28 +1,29 @@
//-----------------------------------------------------------------------
// <copyright file="PssApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>09.09.2013</sience>
//----------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the pss API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.GeoApi
{
using System.Collections.Generic;
using CampusAppWP8.Model;
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model;
using CampusAppWPortalLib8.Model.GeoDb;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>Pss api.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <summary> Pss api. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
/// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
public class PssApi : XmlModel<SpsModel>
{
#region Constructor
/// <summary>Initializes a new instance of the PssApi class.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <summary> Initializes a new instance of the PssApi class. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
public PssApi()
: base(ModelType.Feed, Constants.UrlPssService)
{
@@ -32,10 +33,10 @@ namespace CampusAppWP8.Api.GeoApi
#region Method
/// <summary>Sets up the service request.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <param name="pidList"> List of pids.</param>
/// <param name="serviceNames">(Optional) list of names of the services.</param>
/// <summary> Sets up the service request. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
/// <param name="pidList"> List of pids. </param>
/// <param name="serviceNames"> (Optional) list of names of the services. </param>
public void SetupServiceRequest(List<string> pidList, List<string> serviceNames = null)
{
string pidListStr = string.Empty;

View File

@@ -1,30 +1,30 @@
//-----------------------------------------------------------------------
// <copyright file="SpsApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>06.08.2013</sience>
//----------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the sps API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.GeoApi
{
using System.Collections.Generic;
using CampusAppWP8.Model;
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Model;
using CampusAppWPortalLib8.Model.Utility;
using CampusAppWPortalLib8.Model.GeoDb;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// Class for SPSAPI
/// </summary>
/// <summary> Class for SPSAPI. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
/// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
public class SpsApi : XmlModel<SpsModel>
{
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="SpsApi" /> class.
/// </summary>
/// <summary> Initializes a new instance of the <see cref="SpsApi" /> class. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
public SpsApi()
: base(ModelType.Feed, Constants.UrlSpsService)
{
@@ -35,16 +35,17 @@ namespace CampusAppWP8.Api.GeoApi
#region Method
/// <summary>
/// Method set the UriParameter of a placeRequest for a given latitude and longitude
/// Method set the UriParameter of a placeRequest for a given latitude and longitude.
/// </summary>
/// <param name="lat">latitude of the place</param>
/// <param name="log">longitude of the place</param>
/// <param name="domian">request domain</param>
public void SetupPlaceRequest(string lat, string log, string domian = null)
/// <remarks> Stubbfel, 14.10.2013. </remarks>
/// <param name="lat"> latitude of the place. </param>
/// <param name="log"> longitude of the place. </param>
/// <param name="domian"> (Optional) request domain. </param>
public void SetupPlaceRequest(double lat, double log, string domian = null)
{
List<UrlParamModel> parameterList = new List<UrlParamModel>();
parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LatitudeParaKey, lat));
parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LongitudeParaKey, log));
parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LatitudeParaKey, lat.ToString()));
parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LongitudeParaKey, log.ToString()));
if (domian != null)
{
parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_DomainParaKey, domian));
@@ -53,15 +54,17 @@ namespace CampusAppWP8.Api.GeoApi
this.SetUriParams(parameterList);
}
/// <summary>Sets up the current place request.</summary>
/// <remarks>Stubbfel, 09.09.2013.</remarks>
/// <param name="domian">(Optional) request domain.</param>
/// <summary> Sets up the current place request. </summary>
/// <remarks> Stubbfel, 09.09.2013. </remarks>
/// <param name="domian"> (Optional) request domain. </param>
public void SetupCurrentPlaceRequest(string domian = null)
{
Utilities.DetermineAndStoreCurrentPosition();
string lat = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Lat);
string log = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Long);
this.SetupPlaceRequest(lat, log, domian);
GeoMapPoint currentPosition = App.LoadFromAppState<GeoMapPoint>(Constants.GeoWatch_CurrentPositionPoint);
if (currentPosition != null)
{
this.SetupPlaceRequest(currentPosition.Latitude, currentPosition.Latitude, domian);
}
}
#endregion

View File

@@ -1,30 +1,27 @@
//-----------------------------------------------------------------------
// <copyright file="LectureApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>13.06.2013</sience>
//----------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the lecture API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.Lecture
{
using CampusAppWP8.Model;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model;
/// <summary>
/// Class for the feed of the Lecture
/// </summary>
/// <remarks>
/// need the XmlAPI
/// </remarks>
/// <summary> Class for the feed of the Lecture. </summary>
/// <remarks> need the XmlAPI. </remarks>
/// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.Lecture.LectureWp8List}"/>
public class LectureApi : XmlModel<LectureWp8List>
{
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="LectureApi" /> class.
/// </summary>
/// <summary> Initializes a new instance of the <see cref="LectureApi" /> class. </summary>
/// <remarks> Stubbfel, 14.10.2013. </remarks>
public LectureApi()
: base(ModelType.Feed, Constants.UrlLecture_ApiBaseAddr)
{

View File

@@ -1,11 +1,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------
// <copyright file="PersonSearchApi.cs" company="BTU/IIT">
// Company copyright tag.
// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
// </copyright>
// <author>stubbfel</author>
// <sience>05.09.2013</sience>
//-----------------------------------------------------------------------------
// <author>Stubbfel</author>
// <date>14.10.2013</date>
// <summary>Implements the person search API class</summary>
//-----------------------------------------------------------------------
namespace CampusAppWP8.Api.Person
{
using CampusAppWP8.Model;
@@ -13,14 +13,15 @@ namespace CampusAppWP8.Api.Person
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model;
/// <summary>Person search api.</summary>
/// <remarks>Stubbfel, 05.09.2013.</remarks>
/// <summary> Person search api. </summary>
/// <remarks> Stubbfel, 05.09.2013. </remarks>
/// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.Person.PersonListWp8Model}"/>
public class PersonSearchApi : XmlModel<PersonListWp8Model>
{
#region Constructor
/// <summary>Initializes a new instance of the PersonSearchApi class.</summary>
/// <remarks>Stubbfel, 05.09.2013.</remarks>
/// <summary> Initializes a new instance of the PersonSearchApi class. </summary>
/// <remarks> Stubbfel, 05.09.2013. </remarks>
public PersonSearchApi()
: base(ModelType.Feed, Constants.UrlPerson_PersonSearchByName)
{

View File

@@ -12,6 +12,8 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Styles/ListButton.xaml"/>
<ResourceDictionary Source="Styles/StartPageStyles.xaml"/>
<ResourceDictionary Source="Styles/Labels.xaml"/>
<ResourceDictionary Source="Styles/UniColors.xaml"/>
<ResourceDictionary>
<local:LocalizedStrings xmlns:local="clr-namespace:CampusAppWP8" x:Key="LocalizedStrings"/>
<local:ThemelizedIcons xmlns:local="clr-namespace:CampusAppWP8" x:Key="ThemelizedIcons"/>

View File

@@ -10,6 +10,7 @@ using System.IO.IsolatedStorage;
using System.Threading;
using System.Windows;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Navigation;
@@ -157,25 +158,45 @@ namespace CampusAppWP8
Settings.AppSetting.InitApp = false;
}
Color appColor = ((SolidColorBrush)App.Current.Resources["PhoneAccentBrush"]).Color;
if (!Settings.AppSetting.DisplaySetting.PhoneAccentColor.Equals(appColor))
{
if (Settings.AppSetting.DisplaySetting.AppAccentColor.Equals(Settings.AppSetting.DisplaySetting.PhoneAccentColor))
{
Settings.AppSetting.DisplaySetting.AppAccentColor = appColor;
}
Settings.AppSetting.DisplaySetting.PhoneAccentColor = appColor;
}
appColor = Settings.AppSetting.DisplaySetting.AppAccentColor;
Utilities.SwitchAccentColor(appColor);
this.UserSettingsLoaded();
Settings.AppSetting.UniNetwork = Utilities.IsUniNetworkAvailable();
if (!Settings.AppSetting.UniNetwork)
Settings.AppSetting.NetworkSetting.UniNetwork = Utilities.IsUniNetworkAvailable();
if (!Settings.AppSetting.NetworkSetting.UniNetwork)
{
Settings.AppSetting.WifiEnable = Utilities.IsWifiAvailable();
Settings.AppSetting.NetworkSetting.WifiEnable = Utilities.IsWifiAvailable();
}
else
{
Settings.AppSetting.WifiEnable = true;
Settings.AppSetting.NetworkSetting.WifiEnable = true;
}
if (Settings.AppSetting.GeoWatchEnable)
if (Settings.AppSetting.LocatingSetting.GeoWatchEnable)
{
Thread thread = new Thread(new ThreadStart(Utilities.DetermineAndStoreCurrentPositionForce));
Thread thread = new Thread(new ThreadStart(this.PositionThread));
thread.Start();
}
}
/// <summary> Position thread. </summary>
/// <remarks> Stubbfel, 18.11.2013. </remarks>
private void PositionThread()
{
Utilities.DetermineAndStoreCurrentPositionForce();
}
/// <summary>
/// Load the usersettings from the store
/// </summary>
@@ -205,7 +226,7 @@ namespace CampusAppWP8
// Dieser Code wird beim Deaktivieren der Anwendung nicht ausgeführt
private void Application_Closing(object sender, ClosingEventArgs e)
{
// Sicherstellen, dass der erforderliche Anwendungszustand hier beibehalten wird
App.SaveToIsolatedStorage<string>("StartPageIndex", null);
}
// Code, der bei einem Navigationsfehler ausgeführt wird

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 979 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 890 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Some files were not shown because too many files have changed in this diff Show More