Open ADK for C#/.NET

Merge lp:~siffalo/open-adk-csharp/open-adk-csharp into lp:~open-adk-team/open-adk-csharp/trunk

  1. open-adk-csharp
  2. Merge into trunk
Proposed by Mark Reichert
Status: Needs review
Proposed branch: lp:~siffalo/open-adk-csharp/open-adk-csharp
Merge into: lp:~open-adk-team/open-adk-csharp/trunk
Diff against target: 257 lines (+95/-10)
3 files modified
open-adk-csharp/src/au/OpenADK-AU-SDO.csproj (+80/-6)
open-adk-csharp/src/core/OpenADK/Impl/MessageDispatcher.cs (+12/-3)
open-adk-csharp/src/us/OpenADK-US-SDO.csproj (+3/-1)
To merge this branch: bzr merge lp:~siffalo/open-adk-csharp/open-adk-csharp
Reviewer Review Type Date Requested Status
Jason Lauman Pending
Review via email: mp+110675@code.launchpad.net

Description of the change

Fixes bugs 1009160 (Errors in OpenADK-AU-SDO.csproj), 1008960 (Incorrect SIF version chosen as "render version" for IDataObjectOutputStream/OnRequest in MessageDispatcher) (change needs to be made in Java as well), and 1008954 (Errors in OpenADK-US-SDO.csproj).

To post a comment you must log in.

Unmerged revisions

9. By Mark Reichert

Bug fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'open-adk-csharp/src/au/OpenADK-AU-SDO.csproj'
2--- open-adk-csharp/src/au/OpenADK-AU-SDO.csproj 2011-11-08 19:59:54 +0000
3+++ open-adk-csharp/src/au/OpenADK-AU-SDO.csproj 2012-06-17 03:37:21 +0000
4@@ -75,7 +75,9 @@
5 </ItemGroup>
6 <ItemGroup>
7 <Compile Include="Properties\AssemblyInfo.cs" />
8+ <Compile Include="sdo\Common\AbstractContentElementType.cs" />
9 <Compile Include="sdo\Common\AcademicYearCode.cs" />
10+ <Compile Include="sdo\Common\ACStrandSubjectArea.cs" />
11 <Compile Include="sdo\Common\Address.cs" />
12 <Compile Include="sdo\Common\AddressList.cs" />
13 <Compile Include="sdo\Common\AddressRoleType.cs" />
14@@ -87,12 +89,21 @@
15 <Compile Include="sdo\Common\AU0600DwellingArrangementType.cs" />
16 <Compile Include="sdo\Common\AU0609RelationshipToStudentType.cs" />
17 <Compile Include="sdo\Common\AUAddressRoleType.cs" />
18+ <Compile Include="sdo\Common\AUCodeSetsACStrandType.cs" />
19+ <Compile Include="sdo\Common\AUCodeSetsAssessmentReportingMethodType.cs" />
20+ <Compile Include="sdo\Common\AUCodeSetsEmploymentTypeType.cs" />
21+ <Compile Include="sdo\Common\AUCodeSetsMaritalStatusAIHWType.cs" />
22+ <Compile Include="sdo\Common\AUCodeSetsNonSchoolEducationType.cs" />
23+ <Compile Include="sdo\Common\AUCodeSetsSchoolEducationLevelTypeType.cs" />
24+ <Compile Include="sdo\Common\AUCodeSetsStaffStatusType.cs" />
25+ <Compile Include="sdo\Common\AUCodeSetsYesOrNoCategoryType.cs" />
26 <Compile Include="sdo\Common\AUEnglishProficiencyType.cs" />
27 <Compile Include="sdo\Common\AULanguageType.cs" />
28 <Compile Include="sdo\Common\AustralianCitizenshipStatusType.cs" />
29 <Compile Include="sdo\Common\AustralianClassificationOfLanguagesType.cs" />
30 <Compile Include="sdo\Common\AustralianStandardClassificationOfCulturalAndEthnicGroupsASCCEGType.cs" />
31 <Compile Include="sdo\Common\AustralianStandardClassificationOfReligiousGroupsASCRGType.cs" />
32+ <Compile Include="sdo\Common\BinaryData.cs" />
33 <Compile Include="sdo\Common\Campus.cs" />
34 <Compile Include="sdo\Common\CampusAUSchoolLevelType.cs" />
35 <Compile Include="sdo\Common\Codeset.cs" />
36@@ -105,6 +116,7 @@
37 <Compile Include="sdo\Common\CountryCode.cs" />
38 <Compile Include="sdo\Common\Demographics.cs" />
39 <Compile Include="sdo\Common\DwellingArrangement.cs" />
40+ <Compile Include="sdo\Common\EducationFilter.cs" />
41 <Compile Include="sdo\Common\ElectronicId.cs" />
42 <Compile Include="sdo\Common\ElectronicIdList.cs" />
43 <Compile Include="sdo\Common\ElectronicIdType.cs" />
44@@ -118,6 +130,12 @@
45 <Compile Include="sdo\Common\IndigenousStatusType.cs" />
46 <Compile Include="sdo\Common\Language.cs" />
47 <Compile Include="sdo\Common\LanguageList.cs" />
48+ <Compile Include="sdo\Common\LearningStandardItemRefId.cs" />
49+ <Compile Include="sdo\Common\LearningStandardItems.cs" />
50+ <Compile Include="sdo\Common\Location.cs" />
51+ <Compile Include="sdo\Common\LocationRefId.cs" />
52+ <Compile Include="sdo\Common\LocationRefIdSIF_RefObject.cs" />
53+ <Compile Include="sdo\Common\LocationType.cs" />
54 <Compile Include="sdo\Common\MapReference.cs" />
55 <Compile Include="sdo\Common\Name.cs" />
56 <Compile Include="sdo\Common\NameType.cs" />
57@@ -131,6 +149,7 @@
58 <Compile Include="sdo\Common\OtherNames.cs" />
59 <Compile Include="sdo\Common\ParentObjectRefId.cs" />
60 <Compile Include="sdo\Common\ParentObjectRefIdSIF_RefObject.cs" />
61+ <Compile Include="sdo\Common\PartialDateType.cs" />
62 <Compile Include="sdo\Common\PermanentResidentStatusType.cs" />
63 <Compile Include="sdo\Common\PersonInfo.cs" />
64 <Compile Include="sdo\Common\PhoneNumber.cs" />
65@@ -139,6 +158,7 @@
66 <Compile Include="sdo\Common\PictureSource.cs" />
67 <Compile Include="sdo\Common\PictureSourceType.cs" />
68 <Compile Include="sdo\Common\PrincipalInfo.cs" />
69+ <Compile Include="sdo\Common\Reference.cs" />
70 <Compile Include="sdo\Common\Relationship.cs" />
71 <Compile Include="sdo\Common\Religion.cs" />
72 <Compile Include="sdo\Common\ReligionType.cs" />
73@@ -154,9 +174,10 @@
74 <Compile Include="sdo\Common\Street.cs" />
75 <Compile Include="sdo\Common\SubjectArea.cs" />
76 <Compile Include="sdo\Common\SubjectAreaList.cs" />
77+ <Compile Include="sdo\Common\TextData.cs" />
78 <Compile Include="sdo\Common\Topics.cs" />
79- <Compile Include="sdo\Common\VisaStatCodeType.cs" />
80 <Compile Include="sdo\Common\VisaSubClassType.cs" />
81+ <Compile Include="sdo\Common\Year.cs" />
82 <Compile Include="sdo\Common\YearLevel.cs" />
83 <Compile Include="sdo\Common\YearLevelCode.cs" />
84 <Compile Include="sdo\Common\YearLevels.cs" />
85@@ -177,6 +198,9 @@
86 <Compile Include="sdo\Datamodel\TimeElement.cs" />
87 <Compile Include="sdo\Datamodel\TimeElements.cs" />
88 <Compile Include="sdo\Datamodel\TimeElementType.cs" />
89+ <Compile Include="sdo\Gradebook\AuditInfo.cs" />
90+ <Compile Include="sdo\Gradebook\CreationUser.cs" />
91+ <Compile Include="sdo\Gradebook\CreationUserType.cs" />
92 <Compile Include="sdo\Gradebook\GradebookDTD.cs" />
93 <Compile Include="sdo\Gradebook\StudentPeriodAttendance.cs" />
94 <Compile Include="sdo\Gradebook\StudentPeriodAttendanceAttendanceStatusType.cs" />
95@@ -186,18 +210,69 @@
96 <Compile Include="sdo\Infrastructure\IdentityAssertions.cs" />
97 <Compile Include="sdo\Infrastructure\InfrastructureDTD.cs" />
98 <Compile Include="sdo\Infrastructure\PasswordList.cs" />
99+ <Compile Include="sdo\Learning\AlternateIdentificationCode.cs" />
100+ <Compile Include="sdo\Learning\AlternateIdentificationCodes.cs" />
101+ <Compile Include="sdo\Learning\Approval.cs" />
102+ <Compile Include="sdo\Learning\Approvals.cs" />
103+ <Compile Include="sdo\Learning\AssociatedObject.cs" />
104+ <Compile Include="sdo\Learning\AssociatedObjects.cs" />
105+ <Compile Include="sdo\Learning\AUCodeSetsLearningStandardItemRelationshipTypesType.cs" />
106+ <Compile Include="sdo\Learning\Author.cs" />
107+ <Compile Include="sdo\Learning\Authors.cs" />
108+ <Compile Include="sdo\Learning\Component.cs" />
109+ <Compile Include="sdo\Learning\Components.cs" />
110+ <Compile Include="sdo\Learning\Contact.cs" />
111+ <Compile Include="sdo\Learning\Contacts.cs" />
112+ <Compile Include="sdo\Learning\Copyright.cs" />
113+ <Compile Include="sdo\Learning\DocumentStatusType.cs" />
114+ <Compile Include="sdo\Learning\Evaluation.cs" />
115+ <Compile Include="sdo\Learning\Evaluations.cs" />
116 <Compile Include="sdo\Learning\LearningDTD.cs" />
117+ <Compile Include="sdo\Learning\LearningResource.cs" />
118+ <Compile Include="sdo\Learning\LearningResourceLocation.cs" />
119+ <Compile Include="sdo\Learning\LearningResourcePackage.cs" />
120+ <Compile Include="sdo\Learning\LearningResourceRefIds.cs" />
121+ <Compile Include="sdo\Learning\LearningStandardDocument.cs" />
122+ <Compile Include="sdo\Learning\LearningStandardDocumentRefId.cs" />
123+ <Compile Include="sdo\Learning\LearningStandardItem.cs" />
124+ <Compile Include="sdo\Learning\LearningStandards.cs" />
125+ <Compile Include="sdo\Learning\LearningStandardSource.cs" />
126+ <Compile Include="sdo\Learning\Organization.cs" />
127+ <Compile Include="sdo\Learning\Organizations.cs" />
128+ <Compile Include="sdo\Learning\PredecessorItems.cs" />
129+ <Compile Include="sdo\Learning\RelatedLearningStandardItem.cs" />
130+ <Compile Include="sdo\Learning\RelatedLearningStandardItems.cs" />
131+ <Compile Include="sdo\Learning\RelatedLearningStandards.cs" />
132+ <Compile Include="sdo\Learning\ResourcesList.cs" />
133+ <Compile Include="sdo\Learning\ResourceType.cs" />
134+ <Compile Include="sdo\Learning\StandardHierarchyLevel.cs" />
135+ <Compile Include="sdo\Learning\StandardIdentifier.cs" />
136+ <Compile Include="sdo\Learning\StandardSettingBody.cs" />
137+ <Compile Include="sdo\Learning\Statement.cs" />
138+ <Compile Include="sdo\Learning\StatementCode.cs" />
139+ <Compile Include="sdo\Learning\StatementCodes.cs" />
140+ <Compile Include="sdo\Learning\Statements.cs" />
141+ <Compile Include="sdo\Learning\Strategies.cs" />
142+ <Compile Include="sdo\Learning\Strategy.cs" />
143 <Compile Include="sdo\Learning\StudentList.cs" />
144 <Compile Include="sdo\Learning\TeacherList.cs" />
145 <Compile Include="sdo\Learning\TeachingGroup.cs" />
146+ <Compile Include="sdo\Learning\TeachingGroupPeriod.cs" />
147+ <Compile Include="sdo\Learning\TeachingGroupPeriodList.cs" />
148 <Compile Include="sdo\Learning\TeachingGroupStudent.cs" />
149 <Compile Include="sdo\Learning\TeachingGroupTeacher.cs" />
150+ <Compile Include="sdo\Programs\AUCodeSets0211ProgramAvailabilityType.cs" />
151+ <Compile Include="sdo\Programs\AUCodeSets0792IdentificationProcedureType.cs" />
152 <Compile Include="sdo\Programs\ManagingSchool.cs" />
153 <Compile Include="sdo\Programs\ManagingSchoolSIF_RefObject.cs" />
154+ <Compile Include="sdo\Programs\ProgramAvailability.cs" />
155 <Compile Include="sdo\Programs\ProgramFundingSource.cs" />
156 <Compile Include="sdo\Programs\ProgramFundingSourceCodeType.cs" />
157 <Compile Include="sdo\Programs\ProgramFundingSources.cs" />
158 <Compile Include="sdo\Programs\ProgramsDTD.cs" />
159+ <Compile Include="sdo\Programs\ProgramStatus.cs" />
160+ <Compile Include="sdo\Programs\ProgramStatusType.cs" />
161+ <Compile Include="sdo\Programs\ReferralSource.cs" />
162 <Compile Include="sdo\Programs\StudentFamilyProgramType.cs" />
163 <Compile Include="sdo\Programs\StudentParticipation.cs" />
164 <Compile Include="sdo\Reporting\AuthorityLevel.cs" />
165@@ -268,7 +343,9 @@
166 <Compile Include="sdo\Student\AU0619EntryType.cs" />
167 <Compile Include="sdo\Student\AU0643ExitWithdrawalStatusType.cs" />
168 <Compile Include="sdo\Student\AU0644ExitWithdrawalType.cs" />
169+ <Compile Include="sdo\Student\AUCodeSetsStaffActivityType.cs" />
170 <Compile Include="sdo\Student\AUSchoolLevelType.cs" />
171+ <Compile Include="sdo\Student\CalendarAttendance.cs" />
172 <Compile Include="sdo\Student\CalendarDate.cs" />
173 <Compile Include="sdo\Student\CalendarDateType.cs" />
174 <Compile Include="sdo\Student\CalendarSIF_RefObject.cs" />
175@@ -296,10 +373,6 @@
176 <Compile Include="sdo\Student\LEAContact.cs" />
177 <Compile Include="sdo\Student\LEAContactList.cs" />
178 <Compile Include="sdo\Student\LEAInfo.cs" />
179- <Compile Include="sdo\Student\Location.cs" />
180- <Compile Include="sdo\Student\LocationRefId.cs" />
181- <Compile Include="sdo\Student\LocationRefIdSIF_RefObject.cs" />
182- <Compile Include="sdo\Student\LocationType.cs" />
183 <Compile Include="sdo\Student\MedicalAlertMessage.cs" />
184 <Compile Include="sdo\Student\MedicalAlertMessages.cs" />
185 <Compile Include="sdo\Student\MembershipType.cs" />
186@@ -307,6 +380,7 @@
187 <Compile Include="sdo\Student\NonSchoolEducationType.cs" />
188 <Compile Include="sdo\Student\OtherLearningArea.cs" />
189 <Compile Include="sdo\Student\OtherLearningAreasList.cs" />
190+ <Compile Include="sdo\Student\ParentRelationshipStatusType.cs" />
191 <Compile Include="sdo\Student\PastoralCare.cs" />
192 <Compile Include="sdo\Student\PreviousSchool.cs" />
193 <Compile Include="sdo\Student\PreviousSchoolsList.cs" />
194@@ -325,6 +399,7 @@
195 <Compile Include="sdo\Student\Severity.cs" />
196 <Compile Include="sdo\Student\SourceCodeType.cs" />
197 <Compile Include="sdo\Student\Staff.cs" />
198+ <Compile Include="sdo\Student\StaffActivity.cs" />
199 <Compile Include="sdo\Student\StaffAssignment.cs" />
200 <Compile Include="sdo\Student\StaffList.cs" />
201 <Compile Include="sdo\Student\StaffPersonal.cs" />
202@@ -336,7 +411,6 @@
203 <Compile Include="sdo\Student\StudentActivityInfo.cs" />
204 <Compile Include="sdo\Student\StudentActivityParticipation.cs" />
205 <Compile Include="sdo\Student\StudentActivityType.cs" />
206- <Compile Include="sdo\Student\StudentAttendance.cs" />
207 <Compile Include="sdo\Student\StudentAttendanceSummary.cs" />
208 <Compile Include="sdo\Student\StudentContact.cs" />
209 <Compile Include="sdo\Student\StudentContactPersonal.cs" />
210
211=== modified file 'open-adk-csharp/src/core/OpenADK/Impl/MessageDispatcher.cs'
212--- open-adk-csharp/src/core/OpenADK/Impl/MessageDispatcher.cs 2011-06-29 21:43:35 +0000
213+++ open-adk-csharp/src/core/OpenADK/Impl/MessageDispatcher.cs 2012-06-17 03:37:21 +0000
214@@ -1091,9 +1091,18 @@
215 }
216
217 // SIF_Version specifies the version of SIF that will be used to render
218- // the SIF_Responses
219- // TODO: Add support for multiple SIF_Request versions
220- renderAsVer = SifVersion.Parse(versions[0].Value);
221+ // the SIF_Responses
222+
223+ SifVersion[] candidateVersions = new SifVersion[versions.Length];
224+ int i = 0;
225+
226+ foreach (SIF_Version version in versions)
227+ {
228+ candidateVersions[i++] = SifVersion.Parse(version.Value);
229+ }
230+
231+ renderAsVer = Adk.GetLatestSupportedVersion(candidateVersions);
232+
233 if (!Adk.IsSIFVersionSupported(renderAsVer))
234 {
235 rethrow = true;
236
237=== modified file 'open-adk-csharp/src/us/OpenADK-US-SDO.csproj'
238--- open-adk-csharp/src/us/OpenADK-US-SDO.csproj 2011-10-12 19:58:24 +0000
239+++ open-adk-csharp/src/us/OpenADK-US-SDO.csproj 2012-06-17 03:37:21 +0000
240@@ -119,7 +119,6 @@
241 <Compile Include="sdo\Assessment\AssessmentSubTestRefIds.cs" />
242 <Compile Include="sdo\Assessment\AssessmentType.cs" />
243 <Compile Include="sdo\Assessment\Choice.cs" />
244- <Compile Include="sdo\Assessment\Choise.cs" />
245 <Compile Include="sdo\Assessment\ContentElement.cs" />
246 <Compile Include="sdo\Assessment\CutScores.cs" />
247 <Compile Include="sdo\Assessment\Descriptive.cs" />
248@@ -129,6 +128,9 @@
249 <Compile Include="sdo\Assessment\Item.cs" />
250 <Compile Include="sdo\Assessment\ItemCharacteristics.cs" />
251 <Compile Include="sdo\Assessment\Items.cs" />
252+ <Compile Include="sdo\Assessment\Measurement.cs" />
253+ <Compile Include="sdo\Assessment\MeasurementCodeEnum.cs" />
254+ <Compile Include="sdo\Assessment\Measurements.cs" />
255 <Compile Include="sdo\Assessment\PerformanceLevel.cs" />
256 <Compile Include="sdo\Assessment\PerformanceLevels.cs" />
257 <Compile Include="sdo\Assessment\ResponseChoicePattern.cs" />

Subscribers

People subscribed via source and target branches