database upgraded and interface added
This commit is contained in:
Finn
parent
f5b94098fb
commit
a4b307ad6c
13 changed files with 2506 additions and 14 deletions
|
|
@ -85,9 +85,11 @@ sub valid_read {
|
||||||
order_by => { -desc => 'submitted_at' },
|
order_by => { -desc => 'submitted_at' },
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
my $associations = $valid_org->entity->associations;
|
||||||
$c->stash(
|
$c->stash(
|
||||||
valid_org => $valid_org,
|
valid_org => $valid_org,
|
||||||
transactions => $transactions,
|
transactions => $transactions,
|
||||||
|
associations => $associations,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -143,7 +145,7 @@ sub merge_list {
|
||||||
$c->redirect_to( '/admin/organisations/' . $org_id );
|
$c->redirect_to( '/admin/organisations/' . $org_id );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
my $org_rs = $c->result_set->search(
|
my $org_rs = $c->result_set->search(
|
||||||
{
|
{
|
||||||
id => { '!=' => $org_id },
|
id => { '!=' => $org_id },
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ use warnings;
|
||||||
|
|
||||||
use base 'DBIx::Class::Schema';
|
use base 'DBIx::Class::Schema';
|
||||||
|
|
||||||
our $VERSION = 16;
|
our $VERSION = 17;
|
||||||
|
|
||||||
__PACKAGE__->load_namespaces;
|
__PACKAGE__->load_namespaces;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,11 @@ __PACKAGE__->might_have(
|
||||||
"Pear::LocalLoop::Schema::Result::User" => "entity_id",
|
"Pear::LocalLoop::Schema::Result::User" => "entity_id",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
__PACKAGE__->might_have(
|
||||||
|
"associations",
|
||||||
|
"Pear::LocalLoop::Schema::Result::EntityAssociation" => "entity_id",
|
||||||
|
);
|
||||||
|
|
||||||
__PACKAGE__->has_many(
|
__PACKAGE__->has_many(
|
||||||
"purchases",
|
"purchases",
|
||||||
"Pear::LocalLoop::Schema::Result::Transaction",
|
"Pear::LocalLoop::Schema::Result::Transaction",
|
||||||
|
|
@ -44,13 +49,6 @@ __PACKAGE__->has_many(
|
||||||
{ cascade_copy => 0, cascade_delete => 0 },
|
{ cascade_copy => 0, cascade_delete => 0 },
|
||||||
);
|
);
|
||||||
|
|
||||||
__PACKAGE__->has_many(
|
|
||||||
"associations",
|
|
||||||
"Pear::LocalLoop::Schema::Result::EntityAssociation",
|
|
||||||
{ "foreign.entity_id" => "self.id" },
|
|
||||||
{ cascade_copy => 0, cascade_delete => 0 },
|
|
||||||
);
|
|
||||||
|
|
||||||
__PACKAGE__->has_many(
|
__PACKAGE__->has_many(
|
||||||
"sales",
|
"sales",
|
||||||
"Pear::LocalLoop::Schema::Result::Transaction",
|
"Pear::LocalLoop::Schema::Result::Transaction",
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,6 @@ use warnings;
|
||||||
|
|
||||||
use base 'DBIx::Class::Core';
|
use base 'DBIx::Class::Core';
|
||||||
|
|
||||||
__PACKAGE__->load_components(qw/
|
|
||||||
InflateColumn::DateTime
|
|
||||||
TimeStamp
|
|
||||||
/);
|
|
||||||
|
|
||||||
__PACKAGE__->table("entity_association");
|
__PACKAGE__->table("entity_association");
|
||||||
|
|
||||||
__PACKAGE__->add_columns(
|
__PACKAGE__->add_columns(
|
||||||
|
|
|
||||||
18
share/ddl/PostgreSQL/deploy/17/001-auto-__VERSION.sql
Normal file
18
share/ddl/PostgreSQL/deploy/17/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
--
|
||||||
|
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||||
|
-- Created on Thu Nov 23 14:08:17 2017
|
||||||
|
--
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: dbix_class_deploymenthandler_versions
|
||||||
|
--
|
||||||
|
CREATE TABLE "dbix_class_deploymenthandler_versions" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"version" character varying(50) NOT NULL,
|
||||||
|
"ddl" text,
|
||||||
|
"upgrade_sql" text,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "dbix_class_deploymenthandler_versions_version" UNIQUE ("version")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
328
share/ddl/PostgreSQL/deploy/17/001-auto.sql
Normal file
328
share/ddl/PostgreSQL/deploy/17/001-auto.sql
Normal file
|
|
@ -0,0 +1,328 @@
|
||||||
|
--
|
||||||
|
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||||
|
-- Created on Thu Nov 23 14:08:16 2017
|
||||||
|
--
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: account_tokens
|
||||||
|
--
|
||||||
|
CREATE TABLE "account_tokens" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"name" text NOT NULL,
|
||||||
|
"used" integer DEFAULT 0 NOT NULL,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "account_tokens_name" UNIQUE ("name")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: entities
|
||||||
|
--
|
||||||
|
CREATE TABLE "entities" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"type" character varying(255) NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: gb_postcodes
|
||||||
|
--
|
||||||
|
CREATE TABLE "gb_postcodes" (
|
||||||
|
"outcode" character(4) NOT NULL,
|
||||||
|
"incode" character(3) DEFAULT '' NOT NULL,
|
||||||
|
"latitude" numeric(7,5),
|
||||||
|
"longitude" numeric(7,5),
|
||||||
|
PRIMARY KEY ("outcode", "incode")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: import_sets
|
||||||
|
--
|
||||||
|
CREATE TABLE "import_sets" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"date" timestamp NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: leaderboards
|
||||||
|
--
|
||||||
|
CREATE TABLE "leaderboards" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"name" character varying(255) NOT NULL,
|
||||||
|
"type" character varying(255) NOT NULL,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "leaderboards_type" UNIQUE ("type")
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: customers
|
||||||
|
--
|
||||||
|
CREATE TABLE "customers" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"display_name" character varying(255) NOT NULL,
|
||||||
|
"full_name" character varying(255) NOT NULL,
|
||||||
|
"year_of_birth" integer NOT NULL,
|
||||||
|
"postcode" character varying(16) NOT NULL,
|
||||||
|
"latitude" numeric(5,2),
|
||||||
|
"longitude" numeric(5,2),
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "customers_idx_entity_id" on "customers" ("entity_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: entity_association
|
||||||
|
--
|
||||||
|
CREATE TABLE "entity_association" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"lis" boolean,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("entity_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: leaderboard_sets
|
||||||
|
--
|
||||||
|
CREATE TABLE "leaderboard_sets" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"leaderboard_id" integer NOT NULL,
|
||||||
|
"date" timestamp NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "leaderboard_sets_idx_leaderboard_id" on "leaderboard_sets" ("leaderboard_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: organisations
|
||||||
|
--
|
||||||
|
CREATE TABLE "organisations" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"name" character varying(255) NOT NULL,
|
||||||
|
"street_name" text,
|
||||||
|
"town" character varying(255) NOT NULL,
|
||||||
|
"postcode" character varying(16),
|
||||||
|
"country" character varying(255),
|
||||||
|
"sector" character varying(1),
|
||||||
|
"pending" boolean DEFAULT false NOT NULL,
|
||||||
|
"is_local" boolean,
|
||||||
|
"submitted_by_id" integer,
|
||||||
|
"latitude" numeric(8,5),
|
||||||
|
"longitude" numeric(8,5),
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "organisations_idx_entity_id" on "organisations" ("entity_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: transactions
|
||||||
|
--
|
||||||
|
CREATE TABLE "transactions" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"buyer_id" integer NOT NULL,
|
||||||
|
"seller_id" integer NOT NULL,
|
||||||
|
"value" numeric(100,0) NOT NULL,
|
||||||
|
"proof_image" text,
|
||||||
|
"submitted_at" timestamp NOT NULL,
|
||||||
|
"purchase_time" timestamp NOT NULL,
|
||||||
|
"distance" numeric(15),
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "transactions_idx_buyer_id" on "transactions" ("buyer_id");
|
||||||
|
CREATE INDEX "transactions_idx_seller_id" on "transactions" ("seller_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: users
|
||||||
|
--
|
||||||
|
CREATE TABLE "users" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"email" text NOT NULL,
|
||||||
|
"join_date" timestamp NOT NULL,
|
||||||
|
"password" character varying(100) NOT NULL,
|
||||||
|
"is_admin" boolean DEFAULT false NOT NULL,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "users_email" UNIQUE ("email")
|
||||||
|
);
|
||||||
|
CREATE INDEX "users_idx_entity_id" on "users" ("entity_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: feedback
|
||||||
|
--
|
||||||
|
CREATE TABLE "feedback" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"user_id" integer NOT NULL,
|
||||||
|
"submitted_at" timestamp NOT NULL,
|
||||||
|
"feedbacktext" text NOT NULL,
|
||||||
|
"app_name" character varying(255) NOT NULL,
|
||||||
|
"package_name" character varying(255) NOT NULL,
|
||||||
|
"version_code" character varying(255) NOT NULL,
|
||||||
|
"version_number" character varying(255) NOT NULL,
|
||||||
|
"actioned" boolean DEFAULT false NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: import_lookups
|
||||||
|
--
|
||||||
|
CREATE TABLE "import_lookups" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"set_id" integer NOT NULL,
|
||||||
|
"name" character varying(255) NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "import_lookups_idx_entity_id" on "import_lookups" ("entity_id");
|
||||||
|
CREATE INDEX "import_lookups_idx_set_id" on "import_lookups" ("set_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: organisation_payroll
|
||||||
|
--
|
||||||
|
CREATE TABLE "organisation_payroll" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"org_id" integer NOT NULL,
|
||||||
|
"submitted_at" timestamp NOT NULL,
|
||||||
|
"entry_period" timestamp NOT NULL,
|
||||||
|
"employee_amount" integer NOT NULL,
|
||||||
|
"local_employee_amount" integer NOT NULL,
|
||||||
|
"gross_payroll" numeric(100,0) NOT NULL,
|
||||||
|
"payroll_income_tax" numeric(100,0) NOT NULL,
|
||||||
|
"payroll_employee_ni" numeric(100,0) NOT NULL,
|
||||||
|
"payroll_employer_ni" numeric(100,0) NOT NULL,
|
||||||
|
"payroll_total_pension" numeric(100,0) NOT NULL,
|
||||||
|
"payroll_other_benefit" numeric(100,0) NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "organisation_payroll_idx_org_id" on "organisation_payroll" ("org_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: session_tokens
|
||||||
|
--
|
||||||
|
CREATE TABLE "session_tokens" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"token" character varying(255) NOT NULL,
|
||||||
|
"user_id" integer NOT NULL,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "session_tokens_token" UNIQUE ("token")
|
||||||
|
);
|
||||||
|
CREATE INDEX "session_tokens_idx_user_id" on "session_tokens" ("user_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: import_values
|
||||||
|
--
|
||||||
|
CREATE TABLE "import_values" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"set_id" integer NOT NULL,
|
||||||
|
"user_name" character varying(255) NOT NULL,
|
||||||
|
"purchase_date" timestamp NOT NULL,
|
||||||
|
"purchase_value" character varying(255) NOT NULL,
|
||||||
|
"org_name" character varying(255) NOT NULL,
|
||||||
|
"transaction_id" integer,
|
||||||
|
"ignore_value" boolean DEFAULT false NOT NULL,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id");
|
||||||
|
CREATE INDEX "import_values_idx_transaction_id" on "import_values" ("transaction_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Table: leaderboard_values
|
||||||
|
--
|
||||||
|
CREATE TABLE "leaderboard_values" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"set_id" integer NOT NULL,
|
||||||
|
"position" integer NOT NULL,
|
||||||
|
"value" numeric(100,0) NOT NULL,
|
||||||
|
"trend" integer DEFAULT 0 NOT NULL,
|
||||||
|
PRIMARY KEY ("id"),
|
||||||
|
CONSTRAINT "leaderboard_values_entity_id_set_id" UNIQUE ("entity_id", "set_id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "leaderboard_values_idx_entity_id" on "leaderboard_values" ("entity_id");
|
||||||
|
CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
--
|
||||||
|
-- Foreign Key Definitions
|
||||||
|
--
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "customers" ADD CONSTRAINT "customers_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "entity_association" ADD CONSTRAINT "entity_association_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "leaderboard_sets" ADD CONSTRAINT "leaderboard_sets_fk_leaderboard_id" FOREIGN KEY ("leaderboard_id")
|
||||||
|
REFERENCES "leaderboards" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "organisations" ADD CONSTRAINT "organisations_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "users" ADD CONSTRAINT "users_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "feedback" ADD CONSTRAINT "feedback_fk_user_id" FOREIGN KEY ("user_id")
|
||||||
|
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_set_id" FOREIGN KEY ("set_id")
|
||||||
|
REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "organisation_payroll" ADD CONSTRAINT "organisation_payroll_fk_org_id" FOREIGN KEY ("org_id")
|
||||||
|
REFERENCES "organisations" ("id") DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "session_tokens" ADD CONSTRAINT "session_tokens_fk_user_id" FOREIGN KEY ("user_id")
|
||||||
|
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_set_id" FOREIGN KEY ("set_id")
|
||||||
|
REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_transaction_id" FOREIGN KEY ("transaction_id")
|
||||||
|
REFERENCES "transactions" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_set_id" FOREIGN KEY ("set_id")
|
||||||
|
REFERENCES "leaderboard_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||||
|
|
||||||
|
;
|
||||||
25
share/ddl/PostgreSQL/upgrade/16-17/001-auto.sql
Normal file
25
share/ddl/PostgreSQL/upgrade/16-17/001-auto.sql
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
-- Convert schema 'share/ddl/_source/deploy/16/001-auto.yml' to 'share/ddl/_source/deploy/17/001-auto.yml':;
|
||||||
|
|
||||||
|
;
|
||||||
|
BEGIN;
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE TABLE "entity_association" (
|
||||||
|
"id" serial NOT NULL,
|
||||||
|
"entity_id" integer NOT NULL,
|
||||||
|
"lis" boolean,
|
||||||
|
PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("entity_id");
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE "entity_association" ADD CONSTRAINT "entity_association_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||||
|
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||||
|
|
||||||
|
;
|
||||||
|
ALTER TABLE import_values ALTER COLUMN transaction_id TYPE integer;
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
|
|
||||||
18
share/ddl/SQLite/deploy/17/001-auto-__VERSION.sql
Normal file
18
share/ddl/SQLite/deploy/17/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
--
|
||||||
|
-- Created by SQL::Translator::Producer::SQLite
|
||||||
|
-- Created on Thu Nov 23 14:08:17 2017
|
||||||
|
--
|
||||||
|
|
||||||
|
;
|
||||||
|
BEGIN TRANSACTION;
|
||||||
|
--
|
||||||
|
-- Table: dbix_class_deploymenthandler_versions
|
||||||
|
--
|
||||||
|
CREATE TABLE dbix_class_deploymenthandler_versions (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
version varchar(50) NOT NULL,
|
||||||
|
ddl text,
|
||||||
|
upgrade_sql text
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX dbix_class_deploymenthandler_versions_version ON dbix_class_deploymenthandler_versions (version);
|
||||||
|
COMMIT;
|
||||||
228
share/ddl/SQLite/deploy/17/001-auto.sql
Normal file
228
share/ddl/SQLite/deploy/17/001-auto.sql
Normal file
|
|
@ -0,0 +1,228 @@
|
||||||
|
--
|
||||||
|
-- Created by SQL::Translator::Producer::SQLite
|
||||||
|
-- Created on Thu Nov 23 14:08:17 2017
|
||||||
|
--
|
||||||
|
|
||||||
|
;
|
||||||
|
BEGIN TRANSACTION;
|
||||||
|
--
|
||||||
|
-- Table: account_tokens
|
||||||
|
--
|
||||||
|
CREATE TABLE account_tokens (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
name text NOT NULL,
|
||||||
|
used integer NOT NULL DEFAULT 0
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX account_tokens_name ON account_tokens (name);
|
||||||
|
--
|
||||||
|
-- Table: entities
|
||||||
|
--
|
||||||
|
CREATE TABLE entities (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
type varchar(255) NOT NULL
|
||||||
|
);
|
||||||
|
--
|
||||||
|
-- Table: gb_postcodes
|
||||||
|
--
|
||||||
|
CREATE TABLE gb_postcodes (
|
||||||
|
outcode char(4) NOT NULL,
|
||||||
|
incode char(3) NOT NULL DEFAULT '',
|
||||||
|
latitude decimal(7,5),
|
||||||
|
longitude decimal(7,5),
|
||||||
|
PRIMARY KEY (outcode, incode)
|
||||||
|
);
|
||||||
|
--
|
||||||
|
-- Table: import_sets
|
||||||
|
--
|
||||||
|
CREATE TABLE import_sets (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
date datetime NOT NULL
|
||||||
|
);
|
||||||
|
--
|
||||||
|
-- Table: leaderboards
|
||||||
|
--
|
||||||
|
CREATE TABLE leaderboards (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
name varchar(255) NOT NULL,
|
||||||
|
type varchar(255) NOT NULL
|
||||||
|
);
|
||||||
|
CREATE UNIQUE INDEX leaderboards_type ON leaderboards (type);
|
||||||
|
--
|
||||||
|
-- Table: customers
|
||||||
|
--
|
||||||
|
CREATE TABLE customers (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
display_name varchar(255) NOT NULL,
|
||||||
|
full_name varchar(255) NOT NULL,
|
||||||
|
year_of_birth integer NOT NULL,
|
||||||
|
postcode varchar(16) NOT NULL,
|
||||||
|
latitude decimal(5,2),
|
||||||
|
longitude decimal(5,2),
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE INDEX customers_idx_entity_id ON customers (entity_id);
|
||||||
|
--
|
||||||
|
-- Table: entity_association
|
||||||
|
--
|
||||||
|
CREATE TABLE entity_association (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
lis boolean,
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE INDEX entity_association_idx_entity_id ON entity_association (entity_id);
|
||||||
|
--
|
||||||
|
-- Table: leaderboard_sets
|
||||||
|
--
|
||||||
|
CREATE TABLE leaderboard_sets (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
leaderboard_id integer NOT NULL,
|
||||||
|
date datetime NOT NULL,
|
||||||
|
FOREIGN KEY (leaderboard_id) REFERENCES leaderboards(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX leaderboard_sets_idx_leaderboard_id ON leaderboard_sets (leaderboard_id);
|
||||||
|
--
|
||||||
|
-- Table: organisations
|
||||||
|
--
|
||||||
|
CREATE TABLE organisations (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
name varchar(255) NOT NULL,
|
||||||
|
street_name text,
|
||||||
|
town varchar(255) NOT NULL,
|
||||||
|
postcode varchar(16),
|
||||||
|
country varchar(255),
|
||||||
|
sector varchar(1),
|
||||||
|
pending boolean NOT NULL DEFAULT false,
|
||||||
|
is_local boolean,
|
||||||
|
submitted_by_id integer,
|
||||||
|
latitude decimal(8,5),
|
||||||
|
longitude decimal(8,5),
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE INDEX organisations_idx_entity_id ON organisations (entity_id);
|
||||||
|
--
|
||||||
|
-- Table: transactions
|
||||||
|
--
|
||||||
|
CREATE TABLE transactions (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
buyer_id integer NOT NULL,
|
||||||
|
seller_id integer NOT NULL,
|
||||||
|
value numeric(100,0) NOT NULL,
|
||||||
|
proof_image text,
|
||||||
|
submitted_at datetime NOT NULL,
|
||||||
|
purchase_time datetime NOT NULL,
|
||||||
|
distance numeric(15),
|
||||||
|
FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (seller_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
|
||||||
|
CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
|
||||||
|
--
|
||||||
|
-- Table: users
|
||||||
|
--
|
||||||
|
CREATE TABLE users (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
email text NOT NULL,
|
||||||
|
join_date datetime NOT NULL,
|
||||||
|
password varchar(100) NOT NULL,
|
||||||
|
is_admin boolean NOT NULL DEFAULT false,
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE INDEX users_idx_entity_id ON users (entity_id);
|
||||||
|
CREATE UNIQUE INDEX users_email ON users (email);
|
||||||
|
--
|
||||||
|
-- Table: feedback
|
||||||
|
--
|
||||||
|
CREATE TABLE feedback (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
user_id integer NOT NULL,
|
||||||
|
submitted_at datetime NOT NULL,
|
||||||
|
feedbacktext text NOT NULL,
|
||||||
|
app_name varchar(255) NOT NULL,
|
||||||
|
package_name varchar(255) NOT NULL,
|
||||||
|
version_code varchar(255) NOT NULL,
|
||||||
|
version_number varchar(255) NOT NULL,
|
||||||
|
actioned boolean NOT NULL DEFAULT false,
|
||||||
|
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX feedback_idx_user_id ON feedback (user_id);
|
||||||
|
--
|
||||||
|
-- Table: import_lookups
|
||||||
|
--
|
||||||
|
CREATE TABLE import_lookups (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
set_id integer NOT NULL,
|
||||||
|
name varchar(255) NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX import_lookups_idx_entity_id ON import_lookups (entity_id);
|
||||||
|
CREATE INDEX import_lookups_idx_set_id ON import_lookups (set_id);
|
||||||
|
--
|
||||||
|
-- Table: organisation_payroll
|
||||||
|
--
|
||||||
|
CREATE TABLE organisation_payroll (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
org_id integer NOT NULL,
|
||||||
|
submitted_at datetime NOT NULL,
|
||||||
|
entry_period datetime NOT NULL,
|
||||||
|
employee_amount integer NOT NULL,
|
||||||
|
local_employee_amount integer NOT NULL,
|
||||||
|
gross_payroll numeric(100,0) NOT NULL,
|
||||||
|
payroll_income_tax numeric(100,0) NOT NULL,
|
||||||
|
payroll_employee_ni numeric(100,0) NOT NULL,
|
||||||
|
payroll_employer_ni numeric(100,0) NOT NULL,
|
||||||
|
payroll_total_pension numeric(100,0) NOT NULL,
|
||||||
|
payroll_other_benefit numeric(100,0) NOT NULL,
|
||||||
|
FOREIGN KEY (org_id) REFERENCES organisations(id)
|
||||||
|
);
|
||||||
|
CREATE INDEX organisation_payroll_idx_org_id ON organisation_payroll (org_id);
|
||||||
|
--
|
||||||
|
-- Table: session_tokens
|
||||||
|
--
|
||||||
|
CREATE TABLE session_tokens (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
token varchar(255) NOT NULL,
|
||||||
|
user_id integer NOT NULL,
|
||||||
|
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX session_tokens_idx_user_id ON session_tokens (user_id);
|
||||||
|
CREATE UNIQUE INDEX session_tokens_token ON session_tokens (token);
|
||||||
|
--
|
||||||
|
-- Table: import_values
|
||||||
|
--
|
||||||
|
CREATE TABLE import_values (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
set_id integer NOT NULL,
|
||||||
|
user_name varchar(255) NOT NULL,
|
||||||
|
purchase_date datetime NOT NULL,
|
||||||
|
purchase_value varchar(255) NOT NULL,
|
||||||
|
org_name varchar(255) NOT NULL,
|
||||||
|
transaction_id integer,
|
||||||
|
ignore_value boolean NOT NULL DEFAULT false,
|
||||||
|
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX import_values_idx_set_id ON import_values (set_id);
|
||||||
|
CREATE INDEX import_values_idx_transaction_id ON import_values (transaction_id);
|
||||||
|
--
|
||||||
|
-- Table: leaderboard_values
|
||||||
|
--
|
||||||
|
CREATE TABLE leaderboard_values (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
set_id integer NOT NULL,
|
||||||
|
position integer NOT NULL,
|
||||||
|
value numeric(100,0) NOT NULL,
|
||||||
|
trend integer NOT NULL DEFAULT 0,
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
CREATE INDEX leaderboard_values_idx_entity_id ON leaderboard_values (entity_id);
|
||||||
|
CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
|
||||||
|
CREATE UNIQUE INDEX leaderboard_values_entity_id_set_id ON leaderboard_values (entity_id, set_id);
|
||||||
|
COMMIT;
|
||||||
66
share/ddl/SQLite/upgrade/16-17/001-auto.sql
Normal file
66
share/ddl/SQLite/upgrade/16-17/001-auto.sql
Normal file
|
|
@ -0,0 +1,66 @@
|
||||||
|
-- Convert schema 'share/ddl/_source/deploy/16/001-auto.yml' to 'share/ddl/_source/deploy/17/001-auto.yml':;
|
||||||
|
|
||||||
|
;
|
||||||
|
BEGIN;
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE TABLE entity_association (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
entity_id integer NOT NULL,
|
||||||
|
lis boolean,
|
||||||
|
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE INDEX entity_association_idx_entity_id ON entity_association (entity_id);
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE TEMPORARY TABLE import_values_temp_alter (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
set_id integer NOT NULL,
|
||||||
|
user_name varchar(255) NOT NULL,
|
||||||
|
purchase_date datetime NOT NULL,
|
||||||
|
purchase_value varchar(255) NOT NULL,
|
||||||
|
org_name varchar(255) NOT NULL,
|
||||||
|
transaction_id integer,
|
||||||
|
ignore_value boolean NOT NULL DEFAULT false,
|
||||||
|
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
INSERT INTO import_values_temp_alter( id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value) SELECT id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value FROM import_values;
|
||||||
|
|
||||||
|
;
|
||||||
|
DROP TABLE import_values;
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE TABLE import_values (
|
||||||
|
id INTEGER PRIMARY KEY NOT NULL,
|
||||||
|
set_id integer NOT NULL,
|
||||||
|
user_name varchar(255) NOT NULL,
|
||||||
|
purchase_date datetime NOT NULL,
|
||||||
|
purchase_value varchar(255) NOT NULL,
|
||||||
|
org_name varchar(255) NOT NULL,
|
||||||
|
transaction_id integer,
|
||||||
|
ignore_value boolean NOT NULL DEFAULT false,
|
||||||
|
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||||
|
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||||
|
);
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE INDEX import_values_idx_set_id02 ON import_values (set_id);
|
||||||
|
|
||||||
|
;
|
||||||
|
CREATE INDEX import_values_idx_transacti00 ON import_values (transaction_id);
|
||||||
|
|
||||||
|
;
|
||||||
|
INSERT INTO import_values SELECT id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value FROM import_values_temp_alter;
|
||||||
|
|
||||||
|
;
|
||||||
|
DROP TABLE import_values_temp_alter;
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
|
|
||||||
91
share/ddl/_source/deploy/17/001-auto-__VERSION.yml
Normal file
91
share/ddl/_source/deploy/17/001-auto-__VERSION.yml
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
---
|
||||||
|
schema:
|
||||||
|
procedures: {}
|
||||||
|
tables:
|
||||||
|
dbix_class_deploymenthandler_versions:
|
||||||
|
constraints:
|
||||||
|
- deferrable: 1
|
||||||
|
expression: ''
|
||||||
|
fields:
|
||||||
|
- id
|
||||||
|
match_type: ''
|
||||||
|
name: ''
|
||||||
|
on_delete: ''
|
||||||
|
on_update: ''
|
||||||
|
options: []
|
||||||
|
reference_fields: []
|
||||||
|
reference_table: ''
|
||||||
|
type: PRIMARY KEY
|
||||||
|
- deferrable: 1
|
||||||
|
expression: ''
|
||||||
|
fields:
|
||||||
|
- version
|
||||||
|
match_type: ''
|
||||||
|
name: dbix_class_deploymenthandler_versions_version
|
||||||
|
on_delete: ''
|
||||||
|
on_update: ''
|
||||||
|
options: []
|
||||||
|
reference_fields: []
|
||||||
|
reference_table: ''
|
||||||
|
type: UNIQUE
|
||||||
|
fields:
|
||||||
|
ddl:
|
||||||
|
data_type: text
|
||||||
|
default_value: ~
|
||||||
|
is_nullable: 1
|
||||||
|
is_primary_key: 0
|
||||||
|
is_unique: 0
|
||||||
|
name: ddl
|
||||||
|
order: 3
|
||||||
|
size:
|
||||||
|
- 0
|
||||||
|
id:
|
||||||
|
data_type: int
|
||||||
|
default_value: ~
|
||||||
|
is_auto_increment: 1
|
||||||
|
is_nullable: 0
|
||||||
|
is_primary_key: 1
|
||||||
|
is_unique: 0
|
||||||
|
name: id
|
||||||
|
order: 1
|
||||||
|
size:
|
||||||
|
- 0
|
||||||
|
upgrade_sql:
|
||||||
|
data_type: text
|
||||||
|
default_value: ~
|
||||||
|
is_nullable: 1
|
||||||
|
is_primary_key: 0
|
||||||
|
is_unique: 0
|
||||||
|
name: upgrade_sql
|
||||||
|
order: 4
|
||||||
|
size:
|
||||||
|
- 0
|
||||||
|
version:
|
||||||
|
data_type: varchar
|
||||||
|
default_value: ~
|
||||||
|
is_nullable: 0
|
||||||
|
is_primary_key: 0
|
||||||
|
is_unique: 1
|
||||||
|
name: version
|
||||||
|
order: 2
|
||||||
|
size:
|
||||||
|
- 50
|
||||||
|
indices: []
|
||||||
|
name: dbix_class_deploymenthandler_versions
|
||||||
|
options: []
|
||||||
|
order: 1
|
||||||
|
triggers: {}
|
||||||
|
views: {}
|
||||||
|
translator:
|
||||||
|
add_drop_table: 0
|
||||||
|
filename: ~
|
||||||
|
no_comments: 0
|
||||||
|
parser_args:
|
||||||
|
sources:
|
||||||
|
- __VERSION
|
||||||
|
parser_type: SQL::Translator::Parser::DBIx::Class
|
||||||
|
producer_args: {}
|
||||||
|
producer_type: SQL::Translator::Producer::YAML
|
||||||
|
show_warnings: 0
|
||||||
|
trace: 0
|
||||||
|
version: 0.11021
|
||||||
1714
share/ddl/_source/deploy/17/001-auto.yml
Normal file
1714
share/ddl/_source/deploy/17/001-auto.yml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -99,6 +99,15 @@ function initMap() {
|
||||||
value="0"<%= $valid_org->pending ? '' : ' checked' %>>
|
value="0"<%= $valid_org->pending ? '' : ' checked' %>>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group row">
|
||||||
|
<label for="local" class="col-md-4 col-form-label">Part of LIS</label>
|
||||||
|
<div class="col-md-8">
|
||||||
|
<select id="local" class="form-control" name="is_local">
|
||||||
|
<option value="0"<%= !$associations->lis ? '' : ' selected' %>>In Story</option>
|
||||||
|
<option value="1"<%= $associations->lis ? ' selected' : '' %>>Not in Story</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label for="local" class="col-md-4 col-form-label">Is Local</label>
|
<label for="local" class="col-md-4 col-form-label">Is Local</label>
|
||||||
<div class="col-md-8">
|
<div class="col-md-8">
|
||||||
|
|
|
||||||
Reference in a new issue