Skip to content

Commit 51779d8

Browse files
Merge remote-tracking branch 'origin/feat/progress_tab' into feat/progress_tab
# Conflicts: # course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
2 parents 034d8d5 + 284561e commit 51779d8

File tree

5 files changed

+300
-259
lines changed

5 files changed

+300
-259
lines changed

app/schemas/org.openedx.app.room.AppDatabase/3.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 3,
5-
"identityHash": "b4e899be0df5caa15bb6c52c6a16c3eb",
5+
"identityHash": "d6028101c7598e8d1c5dedfcfc73d304",
66
"entities": [
77
{
88
"tableName": "course_discovery_table",
@@ -1008,7 +1008,7 @@
10081008
},
10091009
{
10101010
"tableName": "course_progress_table",
1011-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`courseId` TEXT NOT NULL, `verifiedMode` TEXT NOT NULL, `accessExpiration` TEXT NOT NULL, `creditCourseRequirements` TEXT NOT NULL, `end` TEXT NOT NULL, `enrollmentMode` TEXT NOT NULL, `hasScheduledContent` INTEGER NOT NULL, `sectionScores` TEXT NOT NULL, `studioUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `userHasPassingGrade` INTEGER NOT NULL, `disableProgressGraph` INTEGER NOT NULL, `assignment_colors` TEXT, `certificate_certStatus` TEXT NOT NULL, `certificate_certWebViewUrl` TEXT NOT NULL, `certificate_downloadUrl` TEXT NOT NULL, `certificate_certificateAvailableDate` TEXT NOT NULL, `completion_completeCount` INTEGER NOT NULL, `completion_incompleteCount` INTEGER NOT NULL, `completion_lockedCount` INTEGER NOT NULL, `grade_letterGrade` TEXT NOT NULL, `grade_percent` REAL NOT NULL, `grade_isPassing` INTEGER NOT NULL, `grading_assignmentPolicies` TEXT NOT NULL, `grading_gradeRange` TEXT NOT NULL, `verification_link` TEXT NOT NULL, `verification_status` TEXT NOT NULL, `verification_statusDate` TEXT NOT NULL, PRIMARY KEY(`courseId`))",
1011+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`courseId` TEXT NOT NULL, `verifiedMode` TEXT NOT NULL, `accessExpiration` TEXT NOT NULL, `creditCourseRequirements` TEXT NOT NULL, `end` TEXT NOT NULL, `enrollmentMode` TEXT NOT NULL, `hasScheduledContent` INTEGER NOT NULL, `sectionScores` TEXT NOT NULL, `studioUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `userHasPassingGrade` INTEGER NOT NULL, `disableProgressGraph` INTEGER NOT NULL, `assignment_colors` TEXT, `certificate_certStatus` TEXT, `certificate_certWebViewUrl` TEXT, `certificate_downloadUrl` TEXT, `certificate_certificateAvailableDate` TEXT, `completion_completeCount` INTEGER, `completion_incompleteCount` INTEGER, `completion_lockedCount` INTEGER, `grade_letterGrade` TEXT, `grade_percent` REAL, `grade_isPassing` INTEGER, `grading_assignmentPolicies` TEXT, `grading_gradeRange` TEXT, `verification_link` TEXT, `verification_status` TEXT, `verification_statusDate` TEXT, PRIMARY KEY(`courseId`))",
10121012
"fields": [
10131013
{
10141014
"fieldPath": "courseId",
@@ -1092,91 +1092,91 @@
10921092
"fieldPath": "certificateData.certStatus",
10931093
"columnName": "certificate_certStatus",
10941094
"affinity": "TEXT",
1095-
"notNull": true
1095+
"notNull": false
10961096
},
10971097
{
10981098
"fieldPath": "certificateData.certWebViewUrl",
10991099
"columnName": "certificate_certWebViewUrl",
11001100
"affinity": "TEXT",
1101-
"notNull": true
1101+
"notNull": false
11021102
},
11031103
{
11041104
"fieldPath": "certificateData.downloadUrl",
11051105
"columnName": "certificate_downloadUrl",
11061106
"affinity": "TEXT",
1107-
"notNull": true
1107+
"notNull": false
11081108
},
11091109
{
11101110
"fieldPath": "certificateData.certificateAvailableDate",
11111111
"columnName": "certificate_certificateAvailableDate",
11121112
"affinity": "TEXT",
1113-
"notNull": true
1113+
"notNull": false
11141114
},
11151115
{
11161116
"fieldPath": "completionSummary.completeCount",
11171117
"columnName": "completion_completeCount",
11181118
"affinity": "INTEGER",
1119-
"notNull": true
1119+
"notNull": false
11201120
},
11211121
{
11221122
"fieldPath": "completionSummary.incompleteCount",
11231123
"columnName": "completion_incompleteCount",
11241124
"affinity": "INTEGER",
1125-
"notNull": true
1125+
"notNull": false
11261126
},
11271127
{
11281128
"fieldPath": "completionSummary.lockedCount",
11291129
"columnName": "completion_lockedCount",
11301130
"affinity": "INTEGER",
1131-
"notNull": true
1131+
"notNull": false
11321132
},
11331133
{
11341134
"fieldPath": "courseGrade.letterGrade",
11351135
"columnName": "grade_letterGrade",
11361136
"affinity": "TEXT",
1137-
"notNull": true
1137+
"notNull": false
11381138
},
11391139
{
11401140
"fieldPath": "courseGrade.percent",
11411141
"columnName": "grade_percent",
11421142
"affinity": "REAL",
1143-
"notNull": true
1143+
"notNull": false
11441144
},
11451145
{
11461146
"fieldPath": "courseGrade.isPassing",
11471147
"columnName": "grade_isPassing",
11481148
"affinity": "INTEGER",
1149-
"notNull": true
1149+
"notNull": false
11501150
},
11511151
{
11521152
"fieldPath": "gradingPolicy.assignmentPolicies",
11531153
"columnName": "grading_assignmentPolicies",
11541154
"affinity": "TEXT",
1155-
"notNull": true
1155+
"notNull": false
11561156
},
11571157
{
11581158
"fieldPath": "gradingPolicy.gradeRange",
11591159
"columnName": "grading_gradeRange",
11601160
"affinity": "TEXT",
1161-
"notNull": true
1161+
"notNull": false
11621162
},
11631163
{
11641164
"fieldPath": "verificationData.link",
11651165
"columnName": "verification_link",
11661166
"affinity": "TEXT",
1167-
"notNull": true
1167+
"notNull": false
11681168
},
11691169
{
11701170
"fieldPath": "verificationData.status",
11711171
"columnName": "verification_status",
11721172
"affinity": "TEXT",
1173-
"notNull": true
1173+
"notNull": false
11741174
},
11751175
{
11761176
"fieldPath": "verificationData.statusDate",
11771177
"columnName": "verification_statusDate",
11781178
"affinity": "TEXT",
1179-
"notNull": true
1179+
"notNull": false
11801180
}
11811181
],
11821182
"primaryKey": {
@@ -1192,7 +1192,7 @@
11921192
"views": [],
11931193
"setupQueries": [
11941194
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
1195-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b4e899be0df5caa15bb6c52c6a16c3eb')"
1195+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd6028101c7598e8d1c5dedfcfc73d304')"
11961196
]
11971197
}
11981198
}

0 commit comments

Comments
 (0)