Permalink
Browse files

:MMM, New register, act and coupon

  • Loading branch information...
nycholas committed Aug 5, 2010
1 parent d8f9981 commit 3032766cc1c62ce50f6bf9149564ce17d97c8dfe
Showing with 3,088 additions and 622 deletions.
  1. +1 −1 Makefile
  2. BIN doc/database/eer/c-project.mwb
  3. BIN doc/database/eer/err.png
  4. +51 −169 doc/database/mysql/create-database.sql
  5. +1 −1 share/Makefile
  6. +1 −1 share/c-project/Makefile.static
  7. +1 −1 share/c-project/translations/Makefile
  8. +1 −1 src/Makefile
  9. +296 −144 src/app/Makefile
  10. +1 −1 src/core/Makefile
  11. +49 −2 src/core/mainwindow.cpp
  12. +6 −2 src/core/mainwindow.h
  13. +73 −21 src/core/models/usermodel.cpp
  14. +16 −3 src/core/models/usermodel.h
  15. +24 −11 src/core/userform.cpp
  16. +59 −69 src/core/widgets/mainwindow.ui
  17. +12 −12 src/core/widgets/userform.ui
  18. +51 −51 src/modules/Makefile
  19. +9 −9 src/modules/{act → admin}/Makefile
  20. 0 src/modules/{act → admin}/act.cpp
  21. 0 src/modules/{act → admin}/act.h
  22. +13 −12 src/modules/{act → admin}/actform.cpp
  23. 0 src/modules/{act → admin}/actform.h
  24. +8 −2 src/modules/{act → admin}/actsearch.cpp
  25. 0 src/modules/{act → admin}/actsearch.h
  26. +11 −0 src/modules/{act/act.pri → admin/admin.pri}
  27. +1 −1 src/modules/{act/act.pro → admin/admin.pro}
  28. 0 src/modules/{act → admin}/coupon.cpp
  29. 0 src/modules/{act → admin}/coupon.h
  30. +3 −3 src/modules/{act → admin}/couponform.cpp
  31. 0 src/modules/{act → admin}/couponform.h
  32. +2 −2 src/modules/{act → admin}/couponsearch.cpp
  33. 0 src/modules/{act → admin}/couponsearch.h
  34. +15 −7 src/modules/{act → admin}/models/actmodel.cpp
  35. +4 −2 src/modules/{act → admin}/models/actmodel.h
  36. +7 −7 src/modules/{act → admin}/models/couponmodel.cpp
  37. 0 src/modules/{act → admin}/models/couponmodel.h
  38. +245 −0 src/modules/admin/models/registermodel.cpp
  39. +96 −0 src/modules/admin/models/registermodel.h
  40. +371 −0 src/modules/admin/register.cpp
  41. +106 −0 src/modules/admin/register.h
  42. +292 −0 src/modules/admin/registerform.cpp
  43. +92 −0 src/modules/admin/registerform.h
  44. +113 −0 src/modules/admin/registersearch.cpp
  45. +72 −0 src/modules/admin/registersearch.h
  46. 0 src/modules/{act → admin}/widgets/act.ui
  47. +42 −24 src/modules/{act → admin}/widgets/actform.ui
  48. +295 −0 src/modules/admin/widgets/actsearch.ui
  49. 0 src/modules/{act → admin}/widgets/coupon.ui
  50. +28 −24 src/modules/{act → admin}/widgets/couponform.ui
  51. +10 −7 src/modules/{act → admin}/widgets/couponsearch.ui
  52. +301 −0 src/modules/admin/widgets/register.ui
  53. +261 −0 src/modules/admin/widgets/registerform.ui
  54. +46 −30 src/modules/{act/widgets/actsearch.ui → admin/widgets/registersearch.ui}
  55. 0 src/modules/{act → admin}/widgets/resources.qrc
  56. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/application-exit.png
  57. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/configure.png
  58. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-cancel.png
  59. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-error.png
  60. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-information.png
  61. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-ok-apply.png
  62. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-ok.png
  63. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-password.png
  64. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/dialog-warning.png
  65. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-new.png
  66. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-open-recent.png
  67. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-open-remote.png
  68. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-open.png
  69. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-print.png
  70. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-save-all.png
  71. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-save-as.png
  72. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/document-save.png
  73. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/documentation.png
  74. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-copy.png
  75. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-cut.png
  76. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-delete.png
  77. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-paste.png
  78. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-redo.png
  79. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/edit-undo.png
  80. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/face-devilish.png
  81. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/go-next-view.png
  82. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/go-next.png
  83. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/go-previous-view.png
  84. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/go-previous.png
  85. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/help-about.png
  86. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/help-contents.png
  87. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/im-status-message-edit.png
  88. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/irc-operator.png
  89. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/list-add-user.png
  90. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/meeting-organizer.png
  91. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/page-zoom.png
  92. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/preferences-desktop.png
  93. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/project-open.png
  94. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/resource-group.png
  95. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/system-log-out.png
  96. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/system-shutdown.png
  97. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/tools-report-bug.png
  98. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/video-display.png
  99. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/view-fullscreen.png
  100. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/view-left-close.png
  101. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/view-left-new.png
  102. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/view-refresh.png
  103. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/view-restore.png
  104. BIN src/modules/{act → admin}/widgets/static/default/icons/22x22/window-close.png
  105. BIN src/modules/{act → admin}/widgets/static/default/icons/32x32/meeting-organizer.png
  106. +1 −1 src/modules/modules.pri
  107. +1 −1 src/modules/modules.pro
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: c-project
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Thu Aug 5 16:45:48 2010
# Project: c-project.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile c-project.pro
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
@@ -12,16 +11,6 @@ USE `cprojectdb` ;
-- Table `cprojectdb`.`app_content_type`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `cprojectdb`.`app_content_type` (
-=======
-DROP SCHEMA IF EXISTS `cproject` ;
-CREATE SCHEMA IF NOT EXISTS `cproject` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-USE `cproject` ;
-
--- -----------------------------------------------------
--- Table `cproject`.`app_content_type`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`app_content_type` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`name` VARCHAR(100) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
`app_label` VARCHAR(100) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
@@ -33,25 +22,19 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
-- Table `cprojectdb`.`auth_user`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_user` (
-=======
--- Table `cproject`.`auth_user`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_user` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`username` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
- `first_name` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
- `last_name` VARCHAR(80) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
- `email` VARCHAR(75) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
+ `first_name` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
+ `last_name` VARCHAR(80) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
+ `email` VARCHAR(75) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
`password` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
- `is_staff` TINYINT(4) NOT NULL ,
+ `is_staff` TINYINT(4) NULL ,
`is_active` TINYINT(4) NOT NULL COMMENT ' ' ,
`is_superuser` TINYINT(4) NOT NULL ,
- `last_login` DATETIME NOT NULL ,
+ `last_login` DATETIME NULL ,
`date_joined` DATETIME NOT NULL ,
PRIMARY KEY (`id`) )
ENGINE = InnoDB
@@ -61,15 +44,9 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
-- Table `cprojectdb`.`app_log`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `cprojectdb`.`app_log` (
-=======
--- Table `cproject`.`app_log`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`app_log` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`auth_user_id` INT(11) NOT NULL ,
`app_content_type_id` INT(11) NULL DEFAULT NULL ,
@@ -83,20 +60,12 @@ CREATE TABLE IF NOT EXISTS `cproject`.`app_log` (
INDEX `fk_app_log_app_content_type1` (`app_content_type_id` ASC) ,
CONSTRAINT `fk_app_log_app_content_type1`
FOREIGN KEY (`app_content_type_id` )
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
REFERENCES `cprojectdb`.`app_content_type` (`id` )
-=======
- REFERENCES `cproject`.`app_content_type` (`id` )
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_app_log_auth_user1`
FOREIGN KEY (`auth_user_id` )
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
REFERENCES `cprojectdb`.`auth_user` (`id` )
-=======
- REFERENCES `cproject`.`auth_user` (`id` )
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB
@@ -105,15 +74,9 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
-- Table `cprojectdb`.`app_session`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `cprojectdb`.`app_session` (
-=======
--- Table `cproject`.`app_session`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`app_session` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`session_key` VARCHAR(40) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
`session_data` LONGTEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
`expire_data` DATETIME NOT NULL ,
@@ -124,15 +87,9 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
-- Table `cprojectdb`.`auth_group`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_group` (
-=======
--- Table `cproject`.`auth_group`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_group` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`name` VARCHAR(80) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
PRIMARY KEY (`id`) )
@@ -144,11 +101,7 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-- Table `cprojectdb`.`auth_permission`
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_permission` (
-=======
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_permission` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`app_content_type_id` INT(11) NOT NULL ,
`name` VARCHAR(100) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
@@ -168,11 +121,7 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-- Table `cprojectdb`.`auth_group_permissions`
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_group_permissions` (
-=======
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_group_permissions` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`auth_permission_id` INT(11) NOT NULL ,
`auth_group_id` INT(11) NOT NULL ,
@@ -188,15 +137,9 @@ CREATE TABLE IF NOT EXISTS `cproject`.`auth_group_permissions` (
FOREIGN KEY (`auth_permission_id` )
REFERENCES `cprojectdb`.`auth_permission` (`id` )
ON DELETE NO ACTION
- ON UPDATE NO ACTION,
- CONSTRAINT `fk_auth_group_permissions_auth_permission1`
- FOREIGN KEY (`auth_permission_id` )
- REFERENCES `cproject`.`auth_permission` (`id` )
- ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
COLLATE = utf8_unicode_ci;
@@ -222,15 +165,12 @@ CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_user_groups` (
ON UPDATE NO ACTION)
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8
-=======
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-- Table `cprojectdb`.`auth_user_user_permissions`
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_user_user_permissions` (
`id` INT(11) NOT NULL AUTO_INCREMENT ,
`auth_user_id` INT(11) NOT NULL ,
@@ -246,23 +186,6 @@ CREATE TABLE IF NOT EXISTS `cprojectdb`.`auth_user_user_permissions` (
CONSTRAINT `fk_auth_user_user_permissions_auth_user1`
FOREIGN KEY (`auth_user_id` )
REFERENCES `cprojectdb`.`auth_user` (`id` )
-=======
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_user_groups` (
- `id` INT(11) NOT NULL AUTO_INCREMENT ,
- `auth_user_id` INT(11) NOT NULL ,
- `auth_group_id` INT(11) NOT NULL ,
- PRIMARY KEY (`id`) ,
- INDEX `fk_auth_user_groups_auth_user1` (`auth_user_id` ASC) ,
- INDEX `fk_auth_user_groups_auth_group1` (`auth_group_id` ASC) ,
- CONSTRAINT `fk_auth_user_groups_auth_group1`
- FOREIGN KEY (`auth_group_id` )
- REFERENCES `cproject`.`auth_group` (`id` )
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
- ON DELETE NO ACTION
- ON UPDATE NO ACTION,
- CONSTRAINT `fk_auth_user_groups_auth_user1`
- FOREIGN KEY (`auth_user_id` )
- REFERENCES `cproject`.`auth_user` (`id` )
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB
@@ -271,120 +194,79 @@ COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
--- Table `cprojectdb`.`act`
+-- Table `cprojectdb`.`admin_register_act`
-- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cprojectdb`.`act` (
- `id` INT NOT NULL ,
- `nome` VARCHAR(45) NULL ,
- `valor` DECIMAL NULL ,
+CREATE TABLE IF NOT EXISTS `cprojectdb`.`admin_register_act` (
+ `id` INT ZEROFILL NOT NULL AUTO_INCREMENT ,
+ `name` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
+ `description` TINYTEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
+ `value` DECIMAL(10,5) NOT NULL ,
+ `date_joined` DATETIME NOT NULL ,
+ `date_changed` DATETIME NULL ,
+ `is_active` TINYINT NOT NULL ,
PRIMARY KEY (`id`) )
-=======
--- Table `cproject`.`auth_user_user_permissions`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`auth_user_user_permissions` (
- `id` INT(11) NOT NULL AUTO_INCREMENT ,
- `auth_user_id` INT(11) NOT NULL ,
- `auth_permission_id` INT(11) NOT NULL ,
- PRIMARY KEY (`id`) ,
- INDEX `fk_auth_user_user_permissions_auth_user1` (`auth_user_id` ASC) ,
- INDEX `fk_auth_user_user_permissions_auth_permission1` (`auth_permission_id` ASC) ,
- CONSTRAINT `fk_auth_user_user_permissions_auth_permission1`
- FOREIGN KEY (`auth_permission_id` )
- REFERENCES `cproject`.`auth_permission` (`id` )
- ON DELETE NO ACTION
- ON UPDATE NO ACTION,
- CONSTRAINT `fk_auth_user_user_permissions_auth_user1`
- FOREIGN KEY (`auth_user_id` )
- REFERENCES `cproject`.`auth_user` (`id` )
- ON DELETE NO ACTION
- ON UPDATE NO ACTION)
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8
COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
--- Table `cprojectdb`.`coupon`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cprojectdb`.`coupon` (
-=======
--- Table `cproject`.`atos`
+-- Table `cprojectdb`.`admin_register_coupon`
-- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`atos` (
- `id` INT NOT NULL ,
- `nome` VARCHAR(45) NULL ,
- `valor` DECIMAL NULL ,
+CREATE TABLE IF NOT EXISTS `cprojectdb`.`admin_register_coupon` (
+ `id` INT ZEROFILL NOT NULL AUTO_INCREMENT ,
+ `id_auth_user` INT NOT NULL ,
+ `name` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
+ `description` TINYTEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
+ `date_joined` DATETIME NOT NULL ,
+ `date_changed` DATETIME NULL ,
+ `is_active` TINYINT NOT NULL ,
PRIMARY KEY (`id`) )
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
--- Table `cproject`.`cupom`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`cupom` (
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
- `id` INT NOT NULL ,
- `valor` VARCHAR(45) NULL ,
- `datetime` TIMESTAMP NULL DEFAULT now() ,
- `auth_user_id` INT(11) NOT NULL ,
- PRIMARY KEY (`id`, `auth_user_id`) ,
- INDEX `fk_cupom_auth_user1` (`auth_user_id` ASC) ,
- CONSTRAINT `fk_cupom_auth_user1`
- FOREIGN KEY (`auth_user_id` )
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
- REFERENCES `cprojectdb`.`auth_user` (`id` )
-=======
- REFERENCES `cproject`.`auth_user` (`id` )
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
- ON DELETE NO ACTION
- ON UPDATE NO ACTION)
-ENGINE = InnoDB;
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
-- -----------------------------------------------------
-<<<<<<< HEAD:doc/database/mysql/create-database.sql
--- Table `cprojectdb`.`act_coupon`
+-- Table `cprojectdb`.`admin_register_act_coupon`
-- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cprojectdb`.`act_coupon` (
- `id` INT NOT NULL ,
+CREATE TABLE IF NOT EXISTS `cprojectdb`.`admin_register_act_coupon` (
+ `id` INT ZEROFILL NOT NULL AUTO_INCREMENT ,
`act_id` INT NOT NULL ,
`coupon_id` INT NOT NULL ,
PRIMARY KEY (`id`) ,
INDEX `fk_cupom_atos_atos1` (`act_id` ASC) ,
INDEX `fk_cupom_atos_cupom1` (`coupon_id` ASC) ,
CONSTRAINT `fk_cupom_atos_atos1`
FOREIGN KEY (`act_id` )
- REFERENCES `cprojectdb`.`act` (`id` )
+ REFERENCES `cprojectdb`.`admin_register_act` (`id` )
ON DELETE NO ACTION
ON UPDATE NO ACTION,
CONSTRAINT `fk_cupom_atos_cupom1`
FOREIGN KEY (`coupon_id` )
- REFERENCES `cprojectdb`.`coupon` (`id` )
-=======
--- Table `cproject`.`atos_cupom`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cproject`.`atos_cupom` (
- `id` INT NOT NULL ,
- `atos_id` INT NOT NULL ,
- `cupom_id` INT NOT NULL ,
- PRIMARY KEY (`id`) ,
- INDEX `fk_cupom_atos_atos1` (`atos_id` ASC) ,
- INDEX `fk_cupom_atos_cupom1` (`cupom_id` ASC) ,
- CONSTRAINT `fk_cupom_atos_atos1`
- FOREIGN KEY (`atos_id` )
- REFERENCES `cproject`.`atos` (`id` )
- ON DELETE NO ACTION
- ON UPDATE NO ACTION,
- CONSTRAINT `fk_cupom_atos_cupom1`
- FOREIGN KEY (`cupom_id` )
- REFERENCES `cproject`.`cupom` (`id` )
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6:resources/db/mysql/create-database.sql
+ REFERENCES `cprojectdb`.`admin_register_coupon` (`id` )
ON DELETE NO ACTION
ON UPDATE NO ACTION)
-ENGINE = InnoDB;
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `cprojectdb`.`admin_register_register`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `cprojectdb`.`admin_register_register` (
+ `id` INT NOT NULL ,
+ `name` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
+ `description` TINYTEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL ,
+ `telephone` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
+ `date_joined` DATETIME NOT NULL ,
+ `date_changed` DATETIME NULL ,
+ `is_active` TINYINT NOT NULL ,
+ PRIMARY KEY (`id`) )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: share
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Thu Aug 5 16:45:48 2010
# Project: share.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile share.pro
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: phony_target
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 19:16:49 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Thu Aug 5 16:45:48 2010
# Project: static.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile.static static.pro
Oops, something went wrong.

0 comments on commit 3032766

Please sign in to comment.