Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix certificates blocks in course info module #471

Merged
merged 2 commits into from
Apr 15, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Stepic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -5754,6 +5754,7 @@
2C89A9461F4C285B00227C3B /* Tokens.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Tokens.plist; path = Content/GMAT/Tokens.plist; sourceTree = "<group>"; };
2C89AB3A1F4C289900227C3B /* Adaptive GMAT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Adaptive GMAT.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2C8AD7612204932200C9C089 /* CourseSubscriptionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseSubscriptionManager.swift; sourceTree = "<group>"; };
2C8C17282260EA94008DC7EA /* Model_course_is_certificate_auto_issued.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_course_is_certificate_auto_issued.xcdatamodel; sourceTree = "<group>"; };
2C8CB0E21FB48F39008CB1AC /* EnrollmentsAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnrollmentsAPI.swift; sourceTree = "<group>"; };
2C8E882B21A2E70F00A27789 /* Model_course_authors_v29.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_course_authors_v29.xcdatamodel; sourceTree = "<group>"; };
2C90522F212E9C9300354DFB /* CoursePlainObjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoursePlainObjectTests.swift; sourceTree = "<group>"; };
@@ -20718,6 +20719,7 @@
08D1EF6E1BB5618700BE84E6 /* Model.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
2C8C17282260EA94008DC7EA /* Model_course_is_certificate_auto_issued.xcdatamodel */,
2C06E09E2241434100AF4DA2 /* Model_profile_fields_v33.xcdatamodel */,
2C4BE7DB221325C000AEAC34 /* Model_course_review_v32.xcdatamodel */,
2C09313321CCFE47002B605D /* Model_course_lesson_fields_v31.xcdatamodel */,
@@ -20753,7 +20755,7 @@
0802AC531C7222B200C4F3E6 /* Model_v2.xcdatamodel */,
08D1EF6F1BB5618700BE84E6 /* Model.xcdatamodel */,
);
currentVersion = 2C06E09E2241434100AF4DA2 /* Model_profile_fields_v33.xcdatamodel */;
currentVersion = 2C8C17282260EA94008DC7EA /* Model_course_is_certificate_auto_issued.xcdatamodel */;
path = Model.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
11 changes: 11 additions & 0 deletions Stepic/Course+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -58,6 +58,8 @@ extension Course {
@NSManaged var managedCertificateEntity: Certificate?
@NSManaged var managedReviewSummary: CourseReviewSummary?

@NSManaged var managedIsCertificateAutoIssued: NSNumber?

class var oldEntity: NSEntityDescription {
return NSEntityDescription.entity(forEntityName: "Course", in: CoreDataHelper.instance.context)!
}
@@ -201,6 +203,15 @@ extension Course {
}
}

var isCertificatesAutoIssued: Bool {
set {
self.managedIsCertificateAutoIssued = newValue as NSNumber?
}
get {
return managedIsCertificateAutoIssued?.boolValue ?? false
}
}

var readiness: Float? {
set {
self.managedReadiness = newValue as NSNumber?
1 change: 1 addition & 0 deletions Stepic/Course.swift
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ final class Course: NSManagedObject, IDFetchable {
authorsArray = json["authors"].arrayObject as? [Int] ?? []
timeToComplete = json["time_to_complete"].int
languageCode = json["language"].stringValue
isCertificatesAutoIssued = json["is_certificate_auto_issued"].boolValue

if let _ = json["intro_video"].null {
introVideo = nil
2 changes: 1 addition & 1 deletion Stepic/Model.xcdatamodeld/.xccurrentversion
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>Model_profile_fields_v33.xcdatamodel</string>
<string>Model_course_is_certificate_auto_issued.xcdatamodel</string>
</dict>
</plist>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -27,10 +27,16 @@ final class CourseInfoTabInfoPresenter: CourseInfoTabInfoPresenterProtocol {
description: user.bio
)
}
let certificateDetailsText = self.makeFormattedCertificateDetailsText(
conditionPoints: course.certificateRegularThreshold,
distinctionPoints: course.certificateDistinctionThreshold
)

let certificateText = course.isCertificatesAutoIssued
? self.makeFormattedCertificateText(course: course)
: nil
let certificateDetailsText = course.isCertificatesAutoIssued
? self.makeFormattedCertificateDetailsText(
conditionPoints: course.certificateRegularThreshold,
distinctionPoints: course.certificateDistinctionThreshold
)
: nil

return CourseInfoTabInfoViewModel(
author: self.makeFormattedAuthorText(authors: course.authors),
@@ -41,7 +47,7 @@ final class CourseInfoTabInfoPresenter: CourseInfoTabInfoPresenterProtocol {
targetAudienceText: course.audience.trimmingCharacters(in: .whitespaces),
timeToCompleteText: self.makeFormattedTimeToCompleteText(timeToComplete: course.timeToComplete),
languageText: self.makeLocalizedLanguageText(code: course.languageCode),
certificateText: self.makeFormattedCertificateText(course: course),
certificateText: certificateText,
certificateDetailsText: certificateDetailsText,
instructors: instructorsViewModel
)
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ struct CourseInfoTabInfoViewModel {

let timeToCompleteText: String
let languageText: String
let certificateText: String
let certificateDetailsText: String
let certificateText: String?
let certificateDetailsText: String?

let instructors: [CourseInfoTabInfoInstructorViewModel]
}
Original file line number Diff line number Diff line change
@@ -83,8 +83,14 @@ final class CourseInfoTabInfoView: UIView {

self.addTextBlockView(block: .timeToComplete, message: viewModel.timeToCompleteText)
self.addTextBlockView(block: .language, message: viewModel.languageText)
self.addTextBlockView(block: .certificate, message: viewModel.certificateText)
self.addTextBlockView(block: .certificateDetails, message: viewModel.certificateDetailsText)

if let certificateText = viewModel.certificateText {
self.addTextBlockView(block: .certificate, message: certificateText)
}

if let certificateDetailsText = viewModel.certificateDetailsText {
self.addTextBlockView(block: .certificateDetails, message: certificateDetailsText)
}

// Redraw self cause geometry & sizes can be changed
self.setNeedsLayout()