Skip to content
Browse files

merge dhoss changes (some minor conflicts)

  • Loading branch information...
2 parents 6afae45 + bc77c84 commit 429b8026dde376c4a5c9a7cdbb51f91d205e2085 Kieren Diment committed Mar 18, 2010
View
BIN Survey-Perl/db/answers.db
Binary file not shown.
View
13 Survey-Perl/dump_survey.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Data::Dumper;
+my $survey = $ARGV[0];
+my $fields = do $survey;
+
+foreach my $aref ( @{$fields} ) {
+ foreach my $field ( @{$aref} ) {
+ next if ref $field ne 'HASH';
+ print $field->{'field'} . "\n";
+ }
+}
View
90 Survey-Perl/fields
@@ -0,0 +1,90 @@
+
+gender
+age
+country_birth
+country_residence
+highest_qual
+field
+perl_formal
+other_dynamic_formal
+other_dynamic_taught
+income
+industries
+
+prog_length
+perl_length
+percent_programming
+percent_management
+percent_perl
+spare_time
+perl_versions
+perl_versions
+
+os_dev
+os_deployment
+
+lang
+lang1
+lang2
+lang3
+lang4
+
+perl_freq
+
+
+pm_list
+tech_list
+tech_list_non_perl
+local_pm
+pm_meetings
+conference
+cpan_modules
+handover_modules
+bug_report_interpreter
+fix_bug_interpreter
+feature_interpreter
+cpan_bug
+cpan_fix_bug
+cpan_feature
+
+legacy
+eliminate
+startup
+unmaintainable
+scale
+management_encourages
+management_outdated
+management_unmaintainable
+management_scale
+first
+beginner
+early_career
+experienced
+sysadmins
+netengs
+embedded
+apps
+
+best
+frustrates
+words
+
+cert_me
+cert_other
+cert_comments
+
+cpan_important
+
+cpan1
+cpan2
+cpan3
+cpan4
+run_tests
+force
+understand
+report
+x_platform
+x_comments
+
+
+email
View
16 Survey-Perl/lib/Survey/Perl/Answers/Schema.pm
@@ -0,0 +1,16 @@
+package Survey::Perl::Answers::Schema;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_classes;
+
+
+# Created by DBIx::Class::Schema::Loader v0.04006 @ 2009-09-11 17:06:47
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nbZ7hOUzma87ik9kPCetYw
+
+
+# You can replace this text with custom content, and it will be preserved on regeneration
+1;
View
552 Survey-Perl/lib/Survey/Perl/Answers/Schema/Result/Survey.pm
@@ -0,0 +1,552 @@
+package Survey::Perl::Answers::Schema::Result::Survey;
+use strict;
+use warnings;
+
+use base 'DBIx::Class';
+
+__PACKAGE__->load_components("Core");
+__PACKAGE__->table("surveys");
+__PACKAGE__->add_columns(
+ "surveyid",
+ {
+ data_type => "INTEGER",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+
+ "gender",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "age",
+ {
+ data_type => "INTEGER",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "country_birth",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 200
+ },
+ "country_residence",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "200",
+ },
+ "highest_qual",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "50",
+ },
+ "field",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "200"
+ },
+ "perl_formal",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "15"
+ },
+ "other_dynamic_formal",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "25"
+ },
+ "other_dynamic_taught",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "25"
+ },
+ "income",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "25"
+ },
+ "industries",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "prog_length",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "perl_length",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "percent_programming",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "percent_management",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "percent_perl",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "spare_time",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "perl_versions",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+
+ "os_dev",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+ "os_deployment",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 10
+ },
+
+ "lang",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "lang1",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "lang2",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "lang3",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "lang4",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "perl_freq",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "pm_list",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "tech_list",
+ {
+ data_type => "text",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "tech_list_non_perl",
+ {
+ data_type => "text",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "local_pm",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "200"
+ },
+ "pm_meetings",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "100"
+ },
+ "conference",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "100"
+ },
+ "cpan_modules",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "25"
+ },
+ "handover_modules",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "bug_report_interpreter",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "fix_bug_interpreter",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "feature_interpreter",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan_bug",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan_fix_bug",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan_feature",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "legacy",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => "100",
+ },
+ "eliminate",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "startup",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "unmaintainable",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "scale",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "management_encourages",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "management_outdated",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+
+ },
+ "management_unmaintainable",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "management_scale",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "first",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "beginner",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "early_career",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "experienced",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "sysadmins",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "netengs",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "embedded",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "apps",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "best",
+ {
+ data_type => "text",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "frustrates",
+ {
+ data_type => "text",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+ "words",
+ {
+ data_type => "text",
+ default_value => "undef",
+ is_nullable => "1",
+ },
+
+ "cert_me",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cert_other",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cert_comments",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "cpan_important",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "cpan1",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan2",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan3",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "cpan4",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "run_tests",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "force",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "understand",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "report",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "x_platform",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+ "x_comments",
+ {
+ data_type => "char",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 100
+ },
+
+ "email",
+ {
+ data_type => "varchar",
+ default_value => "undef",
+ is_nullable => "1",
+ size => 255
+ },
+
+);
+__PACKAGE__->set_primary_key("surveyid");
+
+1;
View
8 Survey-Perl/lib/Survey/Perl/Auth/Schema.pm
@@ -5,12 +5,6 @@ use warnings;
use base 'DBIx::Class::Schema';
-__PACKAGE__->load_classes;
+__PACKAGE__->load_namespaces;
-
-# Created by DBIx::Class::Schema::Loader v0.04006 @ 2009-09-11 17:06:47
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nbZ7hOUzma87ik9kPCetYw
-
-
-# You can replace this text with custom content, and it will be preserved on regeneration
1;
View
6 Survey-Perl/lib/Survey/Perl/Controller/Survey.pm
@@ -29,4 +29,10 @@ sub finish_survey :Chained("survey_base") :PathPart("finish") :Args(0) {
$c->res->body($c->sessionid);
}
+sub finish_survey : Chained("survey_base") PathPart("finish") Args(0) {
+ my ($self, $c) = @_;
+
+
+}
+
1;
View
33 Survey-Perl/lib/Survey/Perl/Model/Answers.pm
@@ -0,0 +1,33 @@
+package Survey::Perl::Model::Answers;
+
+use strict;
+use base 'Catalyst::Model::DBIC::Schema';
+
+__PACKAGE__->config(
+ schema_class => 'Survey::Perl::Answers::Schema',
+
+);
+
+=head1 NAME
+
+Survey::Perl::Model::Auth - Catalyst DBIC Schema Model
+=head1 SYNOPSIS
+
+See L<Survey::Perl>
+
+=head1 DESCRIPTION
+
+L<Catalyst::Model::DBIC::Schema> Model using schema L<Survey::Perl::Auth::Schema>
+
+=head1 AUTHOR
+
+Kieren Diment
+
+=head1 LICENSE
+
+This library is free software, you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+1;
View
2 Survey-Perl/root/survey/index.tt
@@ -89,7 +89,7 @@ $(document).ready(function(){
<div class="formContainer">
-<form name="" action = "[% c.uri_for('finish') %]" method="POST">
+<form name="" action = "[% c.uri_for_action('/survey/finish') %]" method="POST">
<ul class="form">
[% FOREACH s IN sections %]
View
1 Survey-Perl/survey/en.pl
@@ -463,6 +463,7 @@
'More than once a year',
'Ususally',
'Almost every meeting' ]},
+<<<<<<< HEAD
{ type => 'radio_list',
title => 'Have you been to a perl related conference (e.g. YAPC/OSDC/Oscon)',
field => 'conference',
View
6 Survey-Perl/survey_perl.conf
@@ -12,6 +12,12 @@ default_view Web
connect_info user
connect_info passwd
</Model>
+ <Model Answers>
+ schema_class Survey::Perl::Answers::Schema
+ connect_info dbi:SQLite:__path_to(db/answers.db)__
+ connect_info ""
+ connect_info ""
+ </Model>
<View JSON>
expose_stash autocomplete
</View>

0 comments on commit 429b802

Please sign in to comment.
Something went wrong with that request. Please try again.