Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@
</div>

<div class="right-button-section">
<ground-copy-survey-controls
*ngIf="createSurveyPhase === CreateSurveyPhase.SHARE_SURVEY"
[surveyId]="surveyId"
></ground-copy-survey-controls>

<button
id="continue-button"
class="continue-button"
Expand Down
2 changes: 0 additions & 2 deletions web/src/app/components/create-survey/create-survey.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { CreateSurveyComponent } from 'app/components/create-survey/create-survey.component';
import { DataSharingTermsModule } from 'app/components/create-survey/data-sharing-terms/data-sharing-terms.module';
import { TaskDetailsModule } from 'app/components/create-survey/task-details/task-details.module';
import { CopySurveyControlsModule } from 'app/components/shared/copy-survey-controls/copy-survey-controls.module';
import { HeaderModule } from 'app/components/shared/header/header.module';
import { ShareSurveyModule } from 'app/components/shared/share-survey/share-survey.module';

Expand All @@ -44,7 +43,6 @@ import { SurveyLoiModule } from './survey-loi/survey-loi.module';
MatInputModule,
MatProgressBarModule,
MatProgressSpinnerModule,
CopySurveyControlsModule,
ShareSurveyModule,
StepCardModule,
SurveyDetailsModule,
Expand Down
9 changes: 0 additions & 9 deletions web/src/app/components/edit-survey/edit-survey.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,6 @@ <h1 class="edit-survey-title" *ngIf="sectionTitle !== ''">
</h1>

<router-outlet></router-outlet>

<div
class="button-section"
*ngIf="navigationService.isShareSurveyPage()"
>
<ground-copy-survey-controls
[surveyId]="surveyId() || ''"
></ground-copy-survey-controls>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions web/src/app/components/edit-survey/edit-survey.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { RouterModule } from '@angular/router';

import { EditSurveyComponent } from 'app/components/edit-survey/edit-survey.component';
import { CopySurveyControlsModule } from 'app/components/shared/copy-survey-controls/copy-survey-controls.module';

import { SurveyHeaderModule } from '../main-page/survey-header/survey-header.module';

Expand All @@ -42,7 +41,6 @@ import { SurveyHeaderModule } from '../main-page/survey-header/survey-header.mod
MatMenuModule,
MatProgressSpinnerModule,
RouterModule,
CopySurveyControlsModule,
SurveyHeaderModule,
],
exports: [EditSurveyComponent],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@
{{generalAccessLabels.get(selectedGeneralAccess)?.description}}
</div>
</div>

<ground-copy-survey-controls
*ngIf="selectedGeneralAccess === SurveyGeneralAccess.UNLISTED"
[surveyId]="survey()?.id || ''"
></ground-copy-survey-controls>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
width: fit-content;
}
}

ground-copy-survey-controls {
margin-left: auto;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const generalAccessLabels = Map<
{
description: $localize`:@@app.texts.generalAccess.unlisted:Everyone with the survey QR code or link can collect data for this survey`,
icon: 'account_circle',
label: $localize`:@@app.labels.unlisted:Unlisted`,
label: $localize`:@@app.labels.unlisted:Anyone with the link`,
},
],
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ import { MatInputModule } from '@angular/material/input';
import { MatListModule } from '@angular/material/list';
import { MatSelectModule } from '@angular/material/select';

import { CopySurveyControlsModule } from 'app/components/shared/copy-survey-controls/copy-survey-controls.module';

import { GeneralAccessControlComponent } from './general-access-control.component';

@NgModule({
declarations: [GeneralAccessControlComponent],
imports: [
CommonModule,
CopySurveyControlsModule,
FormsModule,
MatButtonModule,
MatDialogModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h1 class="page-title" i18n="@@app.labels.surveys">Surveys</h1>
<span
*ngIf="filter === SurveyListFilter.UNLISTED"
i18n="@@app.labels.unlisted"
>Unlisted</span
>Anyone with the link</span
>
<span *ngIf="filter === SurveyListFilter.PUBLIC" i18n="@@app.labels.public"
>Public</span
Expand Down
2 changes: 1 addition & 1 deletion web/src/locale/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"app.texts.generalAccess.restricted": "Only people with access can open with the link",
"app.labels.restricted": "Restricted",
"app.texts.generalAccess.unlisted": "Everyone with the survey QR code or link can collect data for this survey",
"app.labels.unlisted": "Unlisted",
"app.labels.unlisted": "Anyone with the link",
"app.texts.generalAccess.public": "Anyone can find and collect data for this survey",
"app.labels.public": "Public",
"app.labels.signOut": "Sign out",
Expand Down
Loading