CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-4069 survey: Fix survey behats

Browse Source
This commit is contained in:
Dani Palou 2022-07-14 09:17:28 +02:00
parent 9a5231d481
commit ab39251a0f
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/feedback/services/feedback-sync.ts
View File

@ -51,7 +51,7 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
courseId: number, courseId: number,
regex?: RegExp, regex?: RegExp,
siteId?: string, siteId?: string,
): Promise<void> { ): Promise<boolean> {
regex = regex || /^.*files$|^timers/; regex = regex || /^.*files$|^timers/;
return super.prefetchAfterUpdate(prefetchHandler, module, courseId, regex, siteId); return super.prefetchAfterUpdate(prefetchHandler, module, courseId, regex, siteId);

10
src/addons/mod/survey/components/index/index.ts
View File

@ -205,21 +205,23 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
if (online && this.isPrefetched()) { if (online && this.isPrefetched()) {
// The survey is downloaded, update the data. // The survey is downloaded, update the data.
try { try {
await AddonModSurveySync.prefetchAfterUpdate( const prefetched = await AddonModSurveySync.prefetchAfterUpdate(
AddonModSurveyPrefetchHandler.instance, AddonModSurveyPrefetchHandler.instance,
this.module, this.module,
this.courseId, this.courseId,
); );
// Update the view. // Update the view.
this.showLoadingAndFetch(false, false); prefetched ?
this.showLoadingAndFetch(false, false) :
this.showLoadingAndRefresh(false);;
} catch { } catch {
// Prefetch failed, refresh the data. // Prefetch failed, refresh the data.
await this.showLoadingAndRefresh(false); this.showLoadingAndRefresh(false);
} }
} else { } else {
// Not downloaded, refresh the data. // Not downloaded, refresh the data.
await this.showLoadingAndRefresh(false); this.showLoadingAndRefresh(false);
} }
} catch (error) { } catch (error) {
CoreDomUtils.showErrorModalDefault(error, 'addon.mod_survey.cannotsubmitsurvey', true); CoreDomUtils.showErrorModalDefault(error, 'addon.mod_survey.cannotsubmitsurvey', true);

12
src/core/features/course/classes/activity-sync.ts
View File

@ -31,7 +31,7 @@ export class CoreCourseActivitySyncBaseProvider<T = void> extends CoreSyncBasePr
* @param courseId Course ID. * @param courseId Course ID.
* @param preventDownloadRegex If regex matches, don't download the data. Defaults to check files. * @param preventDownloadRegex If regex matches, don't download the data. Defaults to check files.
* @param siteId Site ID. If not defined, current site. * @param siteId Site ID. If not defined, current site.
* @return Promise resolved when done. * @return Promise resolved with boolean: true if prefetched, false if no need to prefetch.
*/ */
async prefetchAfterUpdate( async prefetchAfterUpdate(
prefetchHandler: CoreCourseModulePrefetchHandlerBase, prefetchHandler: CoreCourseModulePrefetchHandlerBase,
@ -39,12 +39,12 @@ export class CoreCourseActivitySyncBaseProvider<T = void> extends CoreSyncBasePr
courseId: number, courseId: number,
preventDownloadRegex?: RegExp, preventDownloadRegex?: RegExp,
siteId?: string, siteId?: string,
): Promise<void> { ): Promise<boolean> {
// Get the module updates to check if the data was updated or not. // Get the module updates to check if the data was updated or not.
const result = await CoreCourseModulePrefetchDelegate.getModuleUpdates(module, courseId, true, siteId); const result = await CoreCourseModulePrefetchDelegate.getModuleUpdates(module, courseId, true, siteId);
if (!result?.updates.length) { if (!result?.updates.length) {
return; return false;
} }
// Only prefetch if files haven't changed, to prevent downloading too much data automatically. // Only prefetch if files haven't changed, to prevent downloading too much data automatically.
@ -52,8 +52,12 @@ export class CoreCourseActivitySyncBaseProvider<T = void> extends CoreSyncBasePr
const shouldDownload = !result.updates.find((entry) => entry.name.match(regex)); const shouldDownload = !result.updates.find((entry) => entry.name.match(regex));
if (shouldDownload) { if (shouldDownload) {
return prefetchHandler.download(module, courseId); await prefetchHandler.download(module, courseId);
return true;
} }
return false;
} }
/** /**