Skip to content

Dev #59

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.

Sign up for GitHub

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

Merged
NicholasRucinski merged 2 commits into from
Nov 30, 2025
Merged

Dev #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9e946
Make nasa require field
jaimenguyen168 Nov 30, 2025
5154110
Merge pull request #58 from Civic-Interactions-Lab/GCCB-227-Dashboard
jaimenguyen168 Nov 30, 2025
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
14 changes: 11 additions & 3 deletions src/components/BugBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
import { Badge } from "@/components/ui/badge";
import { BugIcon } from "lucide-react";
import { BugIcon, CheckCircleIcon } from "lucide-react";

interface BugBadgeProps {
bugPercentage: number;
className?: string;
}

const BugBadge = ({ bugPercentage, className }: BugBadgeProps) => {
const isZero = bugPercentage === 0;

return (
<Badge
variant="secondary"
className={`bg-orange-900 text-orange-200 rounded-xl justify-center py-0.5 sm:py-1 text-[10px] sm:text-xs flex items-center gap-1 ${className || ""}`}
className={`${
isZero ? "bg-green-900 text-green-200" : "bg-orange-900 text-orange-200"
} rounded-xl justify-center py-0.5 sm:py-1 text-[10px] sm:text-xs flex items-center gap-1 ${className || ""}`}
>
<BugIcon className="size-3" />
{isZero ? (
<CheckCircleIcon className="size-3" />
) : (
<BugIcon className="size-3" />
)}
{bugPercentage}%
</Badge>
);
Expand Down
59 changes: 29 additions & 30 deletions src/pages/dashboard/ui/views/admin/CreateEditSurveyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const CreateEditSurveyView = () => {
const [editingQuestion, setEditingQuestion] = useState<string | null>(null);
const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
const [pendingUpdates, setPendingUpdates] = useState<Map<string, any>>(
new Map()
new Map(),
);

// Get surveyId from URL - you'll need to replace this with your router logic
Expand Down Expand Up @@ -149,8 +149,8 @@ const CreateEditSurveyView = () => {
// Always update local state
setQuestions((prev) =>
prev.map((question) =>
question.id === questionId ? { ...question, ...updates } : question
)
question.id === questionId ? { ...question, ...updates } : question,
),
);

setHasUnsavedChanges(true);
Expand All @@ -163,7 +163,7 @@ const CreateEditSurveyView = () => {
return newMap;
});
},
[questions]
[questions],
);

const addQuestion = async (
Expand All @@ -174,12 +174,12 @@ const CreateEditSurveyView = () => {
| "likert"
| "section_title"
| "slider"
| "nasa_tlx"
| "nasa_tlx",
) => {
// Get the next order number for all questions (including section titles)
const maxQuestionNumber = Math.max(
...questions.map((q) => q.question_number),
0
0,
);
const newQuestionNumber = maxQuestionNumber + 1;

Expand Down Expand Up @@ -652,7 +652,7 @@ interface QuestionItemProps {
setEditingQuestion: (id: string | null) => void;
updateQuestion: (
questionId: string,
updates: Partial<SurveyQuestion>
updates: Partial<SurveyQuestion>,
) => void;
deleteQuestion: (questionId: string) => void;
moveUp: (questionId: string) => void;
Expand Down Expand Up @@ -686,7 +686,7 @@ const QuestionItem = ({
const handleDeleteOption = (optionIndex: number) => {
if (!question.question_options) return;
const newOptions = question.question_options.filter(
(_, index) => index !== optionIndex
(_, index) => index !== optionIndex,
);
updateQuestion(question.id, { question_options: newOptions });
};
Expand Down Expand Up @@ -727,7 +727,7 @@ const QuestionItem = ({
variant={editingQuestion === question.id ? "outline" : "default"}
onClick={() =>
setEditingQuestion(
editingQuestion === question.id ? null : question.id
editingQuestion === question.id ? null : question.id,
)
}
>
Expand Down Expand Up @@ -817,25 +817,24 @@ const QuestionItem = ({
</div>
)}

{question.question_type !== "section_title" &&
question.question_type !== "nasa_tlx" && (
<div className="flex items-center space-x-2">
<input
type="checkbox"
id={`required-${question.id}`}
checked={question.is_required}
onChange={(e) =>
updateQuestion(question.id, {
is_required: e.target.checked,
})
}
className="rounded"
/>
<Label htmlFor={`required-${question.id}`} className="text-sm">
Required
</Label>
</div>
)}
{question.question_type !== "section_title" && (
<div className="flex items-center space-x-2">
<input
type="checkbox"
id={`required-${question.id}`}
checked={question.is_required}
onChange={(e) =>
updateQuestion(question.id, {
is_required: e.target.checked,
})
}
className="rounded"
/>
<Label htmlFor={`required-${question.id}`} className="text-sm">
Required
</Label>
</div>
)}

{question.question_type === "nasa_tlx" && (
<div>
Expand Down Expand Up @@ -921,7 +920,7 @@ const QuestionItem = ({
onClick={() => {
const newScales =
question.question_options?.filter(
(_, i) => i !== index
(_, i) => i !== index,
) || [];
updateQuestion(question.id, {
question_options: newScales,
Expand Down Expand Up @@ -983,7 +982,7 @@ const QuestionItem = ({
].map((standardScale) => {
const scaleString = `${standardScale.name}|${standardScale.low}|${standardScale.high}`;
const alreadyExists = question.question_options?.some(
(option) => option.split("|")[0] === standardScale.name
(option) => option.split("|")[0] === standardScale.name,
);

return (
Expand Down