Implementation of the cancel design change.

diff --git a/PartsList/PartsList/app/controllers/DesignChangeController.scala b/PartsList/PartsList/app/controllers/DesignChangeController.scala
index 42a90c2..1904cde 100644 (file)
--- a/PartsList/PartsList/app/controllers/DesignChangeController.scala
+++ b/PartsList/PartsList/app/controllers/DesignChangeController.scala
@@ -8,6 +8,7 @@ import models._
 import forms._
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
+import org.squeryl.annotations.Column
 
 object DesignChangeController extends Controller{
   
@@ -67,6 +68,17 @@ object DesignChangeController extends Controller{
     }
   }
   
+  def designChangeCancel(id: Long) = Action { 
+           inTransaction {
+             val cancelDesignChange = getDesignChange(id)
+             PartsListDb.partRelations.deleteWhere(pr => pr.addDcId === cancelDesignChange.id)
+             PartsListDb.partRelations.update(pr =>
+                        where(pr.delDcId === cancelDesignChange.id)
+                        set(pr.delDcId := 0L))
+             Redirect(routes.DesignChangeController.designChangeCoverModify(id))
+           }
+  }
+  
   def getDesignChange(id: Long):DesignChange = {
     PartsListDb.designChanges.where(dc => dc.id === id).head
   }

diff --git a/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html b/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
index 7abb06f..3977891 100644 (file)
--- a/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
+++ b/PartsList/PartsList/app/views/updateDesignChangeForm.scala.html
@@ -37,6 +37,11 @@
                </tbody>
        </table>
        <br />
+       @form(routes.DesignChangeController.designChangeCancel(id: Long)) {
+               <input type="hidden" id="id" value=designChangeForm("id") >
+               <input type="submit" class="btn success" value=@Messages("btn.label5") >
+       }
+       <br />
     <a href="/designchangelist?page=0&key=">@Messages("title21")@Messages("title15")</a>
        
 }
\ No newline at end of file

diff --git a/PartsList/PartsList/conf/messages b/PartsList/PartsList/conf/messages
index ec75a88..ec74eef 100644 (file)
--- a/PartsList/PartsList/conf/messages
+++ b/PartsList/PartsList/conf/messages
@@ -73,6 +73,7 @@ btn.label1=search
 btn.label2=Notification
 btn.label3=Request
 btn.label4=change action
+btn.label5=design change cancel
 issue.message0=Has been notified.
 issue.message1=Has been requested.
 issue.message2=Has been answered.

diff --git a/PartsList/PartsList/conf/messages.en b/PartsList/PartsList/conf/messages.en
index ec75a88..ec74eef 100644 (file)
--- a/PartsList/PartsList/conf/messages.en
+++ b/PartsList/PartsList/conf/messages.en
@@ -73,6 +73,7 @@ btn.label1=search
 btn.label2=Notification
 btn.label3=Request
 btn.label4=change action
+btn.label5=design change cancel
 issue.message0=Has been notified.
 issue.message1=Has been requested.
 issue.message2=Has been answered.

diff --git a/PartsList/PartsList/conf/messages.ja b/PartsList/PartsList/conf/messages.ja
index 60338c7..056fb13 100644 (file)
--- a/PartsList/PartsList/conf/messages.ja
+++ b/PartsList/PartsList/conf/messages.ja
@@ -73,6 +73,7 @@ btn.label1=検索
 btn.label2=通知
 btn.label3=依頼
 btn.label4=変更指示
+btn.label5=設計変更取消
 issue.message0=通知が、無事発行されました。
 issue.message1=依頼が、無事発行されました。
 issue.message2=回答が、無事発行されました。

diff --git a/PartsList/PartsList/conf/messages.ja-JP b/PartsList/PartsList/conf/messages.ja-JP
index 60338c7..056fb13 100644 (file)
--- a/PartsList/PartsList/conf/messages.ja-JP
+++ b/PartsList/PartsList/conf/messages.ja-JP
@@ -73,6 +73,7 @@ btn.label1=検索
 btn.label2=通知
 btn.label3=依頼
 btn.label4=変更指示
+btn.label5=設計変更取消
 issue.message0=通知が、無事発行されました。
 issue.message1=依頼が、無事発行されました。
 issue.message2=回答が、無事発行されました。

diff --git a/PartsList/PartsList/conf/routes b/PartsList/PartsList/conf/routes
index 4f82aa8..d79c1ef 100644 (file)
--- a/PartsList/PartsList/conf/routes
+++ b/PartsList/PartsList/conf/routes
@@ -26,6 +26,7 @@ GET            /designChangeCoverForm          controllers.DesignChangeController.create
 POST    /designChangeCover                      controllers.DesignChangeController.designChangeCoverRegistration
 GET             /designChangeCoverModify        controllers.DesignChangeController.designChangeCoverModify(id:Long)
 POST    /designChangeCoverModification         controllers.DesignChangeController.designChangeCoverModification(id: Long)
+POST    /designChangeCancel                     controllers.DesignChangeController.designChangeCancel(id:Long)
 GET             /projectCreate                          controllers.ProjectController.createProject
 POST    /projectSave                                    controllers.ProjectController.projectRegistration()
 GET             /projectModify                          controllers.ProjectController.updateProject(id:Long)